slide_hero 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ab8f64da24ee4cbcb91a7f8d392e2593f22eae
-  data.tar.gz: 4d1ea35db58b8ccec969d1a701170fd14e48733a
+  metadata.gz: eea8fd7d40b7ac15991d031fa339c5a685639c8f
+  data.tar.gz: af7ac4484b30e27993015101cdcbafbb42a44e33
 SHA512:
-  metadata.gz: 916b941004ac4f84c4be11503ae1962c05179855053f1b799938b9ba4122fbdfe47620fe27b56549d3a1cd45f50761cf33548ee7ca4f1d442ab9af426008ef17
-  data.tar.gz: f5ee06ef353fc4aeaf4b75022f8ab891852c024792b3c9aaae395c5fa419e308c4638d275475115abe7914829bedcee004792c29897ffa0d889b19651c55d3fd
+  metadata.gz: 784cc104067b250611f492d567de86a9df8e5020e0a41ec0651683152661d6f8805928cc77bbbdcc15906603fd528aff02c715abc42eae5596199d7f1fe0c0cf
+  data.tar.gz: 4a4b6a552bcbcfd2c64a646fd4625c3c0f34b2c47a6969835c610fdf91261aab0c7b472650cc07168bdd46a6d553b127a7e6c76271f52b44258e9cb722317171

data/Gemfile

@@ -1,4 +1,4 @@
-ruby '2.2.0'
+ruby '2.2.1'
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in slide_hero.gemspec

data/README.md

@@ -102,12 +102,32 @@ this one slide. Any css color will work.
 
 ```ruby
 presentation "My Presentation" do
-  slide "A slide", background_color: 'blue' do
+  slide "A slide", background: 'blue' do
     #…
   end
 end
 ```
 
+The `background` option also supports images. If you give a the name of a
+image, it will look for a file by that name in your `images` directory. 
+
+```ruby
+presentation "My Presentation" do
+  slide "A slide", background: 'bunnies.gif' do
+    #…
+  end
+end
+```
+
+You can also give it a url to load a remote image.
+
+```ruby
+presentation "My Presentation" do
+  slide "A slide", background: 'http://example.com/bunnies.gif' do
+    #…
+  end
+end
+```
 
 **defaults**
 

data/lib/slide_hero.rb

@@ -1,6 +1,7 @@
 require_relative "slide_hero/version"
 require_relative "slide_hero/plugins"
-require_relative "slide_hero/slide"
+require_relative "slide_hero/compilable"
+require_relative "slide_hero/pluggable"
 require_relative "slide_hero/point"
 require_relative "slide_hero/list"
 require_relative "slide_hero/list_point"
@@ -11,6 +12,7 @@ require_relative "slide_hero/note"
 require_relative "slide_hero/image"
 require_relative "slide_hero/remote_image"
 require_relative "slide_hero/media"
+require_relative "slide_hero/slide"
 require_relative "slide_hero/dsl"
 
 module SlideHero

data/lib/slide_hero/code.rb

@@ -1,18 +1,13 @@
 module SlideHero
   class Code
+    include Compilable
     attr_reader :language, :source, :location
     def initialize(language, code_path=Dir.pwd, &code_file)
       @language = language
       @location = "#{code_path}/code/#{code_file.call}"
       @source = File.read(location)
-    rescue Errno::ENOENT 
+    rescue Errno::ENOENT
       abort "#{Dir.pwd}/#{code_file.call} not found"
     end
-
-    def compile
-      Tilt::ERBTemplate.
-        new(File.join(SlideHero.template_path,
-                      'lib/slide_hero/views/code.html.erb')).render(self)
-    end
   end
 end

data/lib/slide_hero/compilable.rb

@@ -0,0 +1,22 @@
+module SlideHero
+  module Compilable
+    def compile
+      Tilt::ERBTemplate.new(
+        File.join(SlideHero.template_path, template)).render(self).strip
+    end
+
+    def template
+      template_file = underscore(self.class.name.split("::").last)
+      "lib/slide_hero/views/#{template_file}.html.erb"
+    end
+
+    def underscore(camel_cased_word)
+      return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
+      word = camel_cased_word.to_s.gsub(/::/, '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.downcase!
+      word
+    end
+  end
+end

data/lib/slide_hero/grouped_slides.rb

@@ -1,16 +1,11 @@
 module SlideHero
   class GroupedSlides
+    include Compilable
     def initialize(slide_defaults={}, &block)
       @slide_defaults = slide_defaults
       instance_eval(&block)
     end
 
-    def compile
-      Tilt::ERBTemplate.
-        new(File.join(SlideHero.template_path, 
-                      'lib/slide_hero/views/grouped_slides.html.erb')).render(self)
-    end
-
     def slide(headline, **kwargs, &block)
       slides << Slide.new(headline, @slide_defaults.merge(**kwargs), &block).compile
     end

data/lib/slide_hero/image.rb

@@ -1,5 +1,6 @@
 module SlideHero
   class Image
+    include Compilable
     attr_reader :location, :alt_text, :width, :height
     def initialize(location, alt_text="", width:nil, height:nil)
       @location = location
@@ -8,10 +9,6 @@ module SlideHero
       @height = height
     end
 
-    def compile
-      %{<img#{width_attribute}#{height_attribute} src="images/#{location}" alt="#{alt_text}">}
-    end
-
     def height_attribute
       %{ height="#{height}"} if height
     end

data/lib/slide_hero/list.rb

@@ -3,17 +3,19 @@ module SlideHero
     attr_reader :style
 
     def initialize(style=:unordered, &block)
-      @style = style 
+      @style = style
       instance_eval(&block)
     end
 
     def compile
       if style == :unordered
-        Tilt::ERBTemplate.new(File.join(SlideHero.template_path, 
-                                        'lib/slide_hero/views/unordered_list.html.erb')).render(self)
+        Tilt::ERBTemplate.new(
+        File.join(SlideHero.template_path, 'lib/slide_hero/views/unordered_list.html.erb')).
+        render(self).strip
       else
-        Tilt::ERBTemplate.new(File.join(SlideHero.template_path, 
-                                        'lib/slide_hero/views/ordered_list.html.erb')).render(self)
+        Tilt::ERBTemplate.new(
+        File.join(SlideHero.template_path, 'lib/slide_hero/views/ordered_list.html.erb')).
+        render(self).strip
       end
     end
 

data/lib/slide_hero/list_point.rb

@@ -1,7 +1,9 @@
 module SlideHero
   class ListPoint
+    include Compilable
+    alias_method :to_s, :compile
     attr_reader :animation, :text
-    SUPPORTED_ANIMATIONS = %w{grow shrink roll-in fade-out 
+    SUPPORTED_ANIMATIONS = %w{grow shrink roll-in fade-out
       highlight-red highlight-green highlight-blue}
 
     def initialize(text, options={})
@@ -9,15 +11,11 @@ module SlideHero
       @animation = options[:animation]
     end
 
-    def to_s
-      "<li#{animation_class}>#{text}</li>"
-    end
-
     def animation_class
       if animation
-        animation_markup = ' class="fragment ' 
+        animation_markup = ' class="fragment '
         if SUPPORTED_ANIMATIONS.include? animation
-          animation_markup << animation 
+          animation_markup << animation
         end
         animation_markup + "\""
       end

data/lib/slide_hero/media.rb

@@ -1,13 +1,10 @@
 module SlideHero
   class Media
+    include Compilable
     attr_reader :url, :type
     def initialize(url, type: :video)
       @url = url
       @type = type
     end
-
-    def compile
-      %{<#{type} data-autoplay src="#{type}/#{url}"></#{type}>}
-    end
   end
 end

data/lib/slide_hero/note.rb

@@ -1,12 +1,9 @@
 module SlideHero
   class Note
+    include Compilable
     attr_reader :text
     def initialize(text)
       @text = text
     end
-
-    def compile
-      %{<aside class="notes">#{text}</aside>}
-    end
   end
 end

data/lib/slide_hero/pluggable.rb

@@ -0,0 +1,31 @@
+module SlideHero
+  module Pluggable
+    def create_plugs_for(*klasses)
+      klasses.each do |klass|
+        method_name = class_name_to_method_name(klass.name)
+        fields = initialization_fields_from_class(klass)
+
+        module_eval %{
+          def #{method_name}(#{fields})
+            points << #{klass}.new(#{fields}).compile
+          end
+        }
+      end
+    end
+
+    def class_name_to_method_name(class_name)
+      class_name.split("::")[-1].
+        gsub(/([A-Z]\w*)([A-Z]\w*)/, '\1_\2').
+        downcase
+    end
+
+    def initialization_fields_from_class(klass)
+      fields = ""
+      arguments = klass.instance_method(:initialize).parameters.to_h
+      fields << "*args" if arguments.has_key?(:req) || arguments.has_key?(:opt)
+      fields << ", **kwargs" if arguments.has_key?(:key)
+      fields << ", &block" if arguments.has_key?(:block)
+      fields
+    end
+  end
+end

data/lib/slide_hero/point.rb

@@ -1,7 +1,8 @@
 module SlideHero
   class Point
+    include Compilable
     attr_reader :text
-    SUPPORTED_ANIMATIONS = %w{grow shrink roll-in fade-out 
+    SUPPORTED_ANIMATIONS = %w{grow shrink roll-in fade-out
       highlight-red highlight-green highlight-blue}
 
     def initialize(text, animation: nil)
@@ -9,16 +10,12 @@ module SlideHero
       @animation = animation
     end
 
-    def compile
-      "<p#{animation}>#{text}</p>"
-    end
-
     private
     def animation
       if @animation
-        animation_markup = ' class="fragment ' 
+        animation_markup = ' class="fragment '
         if SUPPORTED_ANIMATIONS.include? @animation
-          animation_markup << @animation 
+          animation_markup << @animation
         end
         animation_markup + "\""
       end

data/lib/slide_hero/slide.rb

@@ -1,53 +1,24 @@
 module SlideHero
   class Slide
-    attr_reader :headline, :headline_size, :transition, :background_color
-    def initialize(headline=nil, headline_size: :medium, transition: :default, background_color: nil, &point_block)
+    include Compilable
+    extend Pluggable
+
+    attr_reader :headline, :headline_size, :transition, :background
+    def initialize(headline=nil, headline_size: :medium, transition: :default, background: nil, &point_block)
       @headline = headline
       @headline_size = headline_size
       @transition = transition
 
-      @background_color = background_color
+      @background= background
       instance_eval(&point_block) if block_given?
     end
 
-    def compile
-      Tilt::ERBTemplate.new(File.join(SlideHero.template_path, 
-                                      'lib/slide_hero/views/slide.html.erb')).
-                                      render(self)
-    end
-
-    def point(text, animation: nil)
-      points << Point.new(text, animation: animation).compile
-    end
-
-    def list(style=:unordered, &block)
-      points << List.new(style, &block).compile
-    end
-
-    def code(*args, &code)
-      points << Code.new(*args, &code).compile
-    end
+    create_plugs_for Note, Point, List, Code, Image, RemoteImage, Media
 
     def points
       @points ||= []
     end
 
-    def note(text)
-      points << Note.new(text).compile
-    end
-
-    def image(*args, **kwargs)
-      points << Image.new(*args, **kwargs).compile
-    end
-
-    def remote_image(*args, **kwargs)
-      points << RemoteImage.new(*args, **kwargs).compile
-    end
-
-    def media(*args, **kwargs)
-      points << Media.new(*args, **kwargs).compile
-    end
-
     private
     def size_to_markup
       {
@@ -59,8 +30,14 @@ module SlideHero
 
     def data_attributes
       "data-transition=\"#{transition}\"".tap do |attr|
-        if background_color
-          attr << " data-background=\"#{background_color}\""
+        case 
+        when String(background).start_with?('http')
+          attr << " data-background=\"#{background}\""
+        when String(background).include?('.')
+          filename = background.gsub(/\s/, "%20")
+          attr << " data-background=\"/images/#{filename}\""
+        when background
+          attr << " data-background=\"#{background}\""
         end
       end
     end

data/lib/slide_hero/version.rb

@@ -1,3 +1,3 @@
 module SlideHero
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/slide_hero/views/image.html.erb

@@ -0,0 +1 @@
+<img<%= width_attribute %><%= height_attribute %> class="stretch" src="images/<%= location %>" alt="<%= alt_text %>">

data/lib/slide_hero/views/list_point.html.erb

@@ -0,0 +1 @@
+<li<%= animation_class %>><%= text %></li>

data/lib/slide_hero/views/media.html.erb

@@ -0,0 +1 @@
+<<%= type %> data-autoplay src="<%= type %>/<%= url %>"></<%= type %>>

data/lib/slide_hero/views/note.html.erb

@@ -0,0 +1 @@
+<aside class="notes"><%= text %></aside>

data/lib/slide_hero/views/point.html.erb

@@ -0,0 +1 @@
+<p<%= animation %>><%= text %></p>

data/test/slide_hero/image_spec.rb

@@ -4,12 +4,12 @@ module SlideHero
   describe Image do
     it "takes an image path and renders appropriate markup" do
       image = Image.new("cornify.gif", "Unicorn", width: 280, height: 326)
-      image.compile.must_equal %{<img width="280" height="326" src="images/cornify.gif" alt="Unicorn">}
+      image.compile.must_equal %{<img width="280" height="326" class="stretch" src="images/cornify.gif" alt="Unicorn">}
     end
 
     it "doesn't require all fields" do
       image = Image.new("cornify.gif")
-      image.compile.must_equal %{<img src="images/cornify.gif" alt="">}
+      image.compile.must_equal %{<img class="stretch" src="images/cornify.gif" alt="">}
     end
   end
 end

data/test/slide_hero/remote_image_spec.rb

@@ -17,7 +17,7 @@ module SlideHero
 
         destination_folder = File.join(Dir.pwd,"test","tmp","images")
         image = RemoteImage.new("http://example.com/troll.png", "Troll", width: 280, height: 326, as: "le_troll", destination: destination_folder)
-        image.compile.must_equal %{<img width="280" height="326" src="images/le_troll.png" alt="Troll">}
+        image.compile.must_equal %{<img width="280" height="326" class="stretch" src="images/le_troll.png" alt="Troll">}
         assert_requested :get, "http://example.com/troll.png"
       end
 
@@ -28,7 +28,7 @@ module SlideHero
         stub_request(:get, "http://example.com/troll.png")
 
         image = RemoteImage.new("http://example.com/troll.png", "Troll", width: 280, height: 326, as: "le_troll", destination: destination_folder)
-        image.compile.must_equal %{<img width="280" height="326" src="images/le_troll.png" alt="Troll">}
+        image.compile.must_equal %{<img width="280" height="326" class="stretch" src="images/le_troll.png" alt="Troll">}
         assert_not_requested :get, "http://example.com/troll.png"
       end
     end
@@ -45,7 +45,7 @@ module SlideHero
 
         destination_folder = File.join(Dir.pwd,"test","tmp","images")
         image = RemoteImage.new("http://example.com/troll.png", "Troll", width: 280, height: 326, destination: destination_folder)
-        image.compile.must_equal %{<img width="280" height="326" src="images/troll.png" alt="Troll">}
+        image.compile.must_equal %{<img width="280" height="326" class="stretch" src="images/troll.png" alt="Troll">}
       end
     end
   end

data/test/slide_hero/slide_spec.rb

@@ -23,8 +23,8 @@ module SlideHero
       end
 
       it "can take a background color" do
-        slide = Slide.new("Badgers learn knitting", background_color: 'blue')
-        slide.background_color.must_equal 'blue'
+        slide = Slide.new("Badgers learn knitting", background: 'blue')
+        slide.background.must_equal 'blue'
       end
     end
 
@@ -52,13 +52,39 @@ module SlideHero
       end
 
       it "takes a background_color" do
-        slide = Slide.new("background_color", background_color: 'blue') do
+        slide = Slide.new("background_color", background: 'blue') do
         end
         assert_dom_match slide.compile, '<section data-transition="default" ' +
          'data-background="blue">' +
           '<h2>background_color</h2>' +
           '</section>'
       end
+
+      it "takes a local image as a background" do
+        slide = Slide.new("background image", background: 'lizard.png') do
+        end
+        assert_dom_match slide.compile, '<section data-transition="default" ' +
+         'data-background="/images/lizard.png">' +
+          '<h2>background image</h2>' +
+          '</section>'
+      end
+      it "escapes filenames with spaces" do
+        slide = Slide.new("background image", background: 'a lizard.png') do
+        end
+        assert_dom_match slide.compile, '<section data-transition="default" ' +
+         'data-background="/images/a%20lizard.png">' +
+          '<h2>background image</h2>' +
+          '</section>'
+      end
+
+      it "can load remote images" do
+        slide = Slide.new("remote image", background: 'http://media3.giphy.com/media/ZFlW5pAMdPjJm/200.gif') do
+        end
+        assert_dom_match slide.compile, '<section data-transition="default" ' +
+         'data-background="http://media3.giphy.com/media/ZFlW5pAMdPjJm/200.gif">' +
+          '<h2>remote image</h2>' +
+          '</section>'
+      end
     end
 
     describe "#point syntax" do
@@ -182,7 +208,7 @@ end
           image("cornify.gif", "Unicorn", width: 280, height: 326)
         end
 
-        slide.compile.must_include %{<img width="280" height="326" src="images/cornify.gif" alt="Unicorn">}
+        slide.compile.must_include %{<img width="280" height="326" class="stretch" src="images/cornify.gif" alt="Unicorn">}
       end
     end
 
@@ -202,7 +228,7 @@ end
           remote_image("http://example.com/troll.png", "Troll", width: 280, height: 326, as: "le_troll", destination: destination_folder)
         end
 
-        slide.compile.must_include %{<img width="280" height="326" src="images/le_troll.png" alt="Troll">}
+        slide.compile.must_include %{<img width="280" height="326" class="stretch" src="images/le_troll.png" alt="Troll">}
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slide_hero
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Steven Nunez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -143,6 +143,7 @@ files:
 - bin/slidehero
 - lib/slide_hero.rb
 - lib/slide_hero/code.rb
+- lib/slide_hero/compilable.rb
 - lib/slide_hero/dsl.rb
 - lib/slide_hero/grouped_slides.rb
 - lib/slide_hero/image.rb
@@ -150,6 +151,7 @@ files:
 - lib/slide_hero/list_point.rb
 - lib/slide_hero/media.rb
 - lib/slide_hero/note.rb
+- lib/slide_hero/pluggable.rb
 - lib/slide_hero/plugins.rb
 - lib/slide_hero/point.rb
 - lib/slide_hero/presentation.rb
@@ -161,8 +163,13 @@ files:
 - lib/slide_hero/views/code.html.erb
 - lib/slide_hero/views/empty.html
 - lib/slide_hero/views/grouped_slides.html.erb
+- lib/slide_hero/views/image.html.erb
 - lib/slide_hero/views/layout.html.erb
+- lib/slide_hero/views/list_point.html.erb
+- lib/slide_hero/views/media.html.erb
+- lib/slide_hero/views/note.html.erb
 - lib/slide_hero/views/ordered_list.html.erb
+- lib/slide_hero/views/point.html.erb
 - lib/slide_hero/views/slide.html.erb
 - lib/slide_hero/views/unordered_list.html.erb
 - slide_hero.gemspec