images_gallery 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6776c25e3826043bb0f8a6b2fd9264670288ffec
-  data.tar.gz: 9a89ef53659d2fbaeb782345752432db6995519a
+  metadata.gz: 67e420173590772158f6bab51506ccd9a836fe5c
+  data.tar.gz: d53ff9a4c056c12d17d31396b8325841ad16111e
 SHA512:
-  metadata.gz: e9e1951ea8e2bfcbe22142fc19cb514150aa1f1e6532583e8b401aaf9966075c76f284727d14d9906ca65ea8cb63b78b7d34f98aa744cc849486966e044cb500
-  data.tar.gz: c6f5e80500100a94b18050ff6a5d0ad841ec5f97df50cfc618d11a0af91ca148543a42fe7eac6800cdd405dd54eb662ac72498668b1ef9b4f725de6c9212facf
+  metadata.gz: 74de38ecf7c3ab952260a7403218354f05eccb271310f77b05872a83b1aa89555c91a6092f3b99bbaf2c6e90dd19ef6f0f2aa459773ea968fba535f3f607175e
+  data.tar.gz: 01e3e36847c68a09f17f8892c793898788b28087f0e2933e2ac1ec41d3aa66dd17875b5166bff707c6df2993633e56e56c30c339479821e6cfcda42579995480

data/lib/images_gallery/cli.rb

@@ -6,15 +6,15 @@ module ImagesGallery
   class CLI < Thor
 
     desc 'generate SOURCE TARGET', 'Generate a static HTML images gallery in the TARGET directory from the SOURCE file contents.'
-    def generate(source, target=nil, error=STDERR, out=STDOUT)
+    def generate(source, target, error=STDERR, out=STDOUT)
       begin
         out.puts generator.run(source, target)
       rescue ImagesGallery::SourceFileNotFoundError
-        error.puts 'Please make sure the specified source file exists.'
+        error.puts 'ERROR: Please make sure the specified source file exists.'
       rescue ImagesGallery::TargetDirectoryNotFoundError
-        error.puts 'Please make sure the specified target directory exists.'
+        error.puts 'ERROR: Please make sure the specified target directory exists.'
       rescue ImagesGallery::SourceFileInvalidError
-        error.puts 'The source file is invalid. Please check it is well-formed XML.'
+        error.puts 'ERROR: The source file is invalid. Please check it is well-formed XML.'
       end
     end
 

data/lib/images_gallery/generator.rb

@@ -1,5 +1,6 @@
 require 'images_gallery/errors'
-require 'images_gallery/source'
+require 'images_gallery/models/collection'
+require 'images_gallery/models/source'
 require 'images_gallery/views/index'
 require 'images_gallery/views/make'
 require 'images_gallery/views/model'
@@ -15,7 +16,7 @@ module ImagesGallery
       raise SourceFileNotFoundError unless File.file? source
       raise TargetDirectoryNotFoundError unless File.directory? target
 
-      @source = Source.new(source)
+      @source = Models::Source.new(source)
       @target = target
 
       @source.parse
@@ -31,14 +32,14 @@ module ImagesGallery
         files['index'] = Views::Index.new(images).render
 
         images.makes.each do |make|
-          images_by_make = Collection.new
+          images_by_make = Models::Collection.new
           images.select{ |image| image.make == make }.each do |image|
             images_by_make << image
             view = Views::Make.new(images_by_make)
             files[view.file_identifier(image.make)] = view.render
 
             images_by_make.models.each do |model|
-              images_by_model = Collection.new
+              images_by_model = Models::Collection.new
               images_by_make.select{ |image| image.model == model }.each do |image|
                 images_by_model << image
                 view = Views::Model.new(images_by_model)

data/lib/images_gallery/models/collection.rb

@@ -0,0 +1,17 @@
+require 'images_gallery/models/image'
+
+module ImagesGallery
+  module Models
+    class Collection < Array
+
+      def makes
+        map { |image| image.make }.uniq.sort
+      end
+
+      def models
+        map { |image| image.model }.uniq.sort
+      end
+
+    end
+  end
+end

data/lib/images_gallery/models/image.rb

@@ -0,0 +1,21 @@
+module ImagesGallery
+  module Models
+    class Image
+
+      attr_accessor :id, :src, :make, :model
+
+      def make
+        @make || 'Unknown Make'
+      end
+
+      def model
+        @model || 'Unknown Model'
+      end
+
+      def description
+        "Image #{@id}"
+      end
+
+    end
+  end
+end

data/lib/images_gallery/models/source.rb

@@ -0,0 +1,107 @@
+require 'libxml'
+
+require 'images_gallery/models/collection'
+require 'images_gallery/models/image'
+
+module ImagesGallery
+  module Models
+    class Source
+
+      include LibXML
+      include XML::SaxParser::Callbacks
+
+      attr_reader :images
+
+      # Provides a collection of images to presenters
+      #
+      # Extracts some images attributes from an XML collection of works
+      # and collects the images as plain Ruby objects so other classes
+      # can use them with presentational purpose.
+      #
+      # This class should be able to parse efficiently large XML files.
+      #
+      # file - Path to an XML representation of the images (metadata, EXIF)
+      #
+      # Example:
+      #
+      #     source = ImagesGallery::Source.new('path/to/source.xml')
+      #     source.parse   # creates a Collection of Images
+      #     source.images  # is available after parsing
+      #
+      # Returns a Source object, ready to parse the corresponding XML file.
+      def initialize(file)
+        @file = XML::SaxParser.file(file)
+        @file.callbacks = self
+      end
+
+      def parse
+        @images = Models::Collection.new
+        begin
+          @file.parse
+        rescue LibXML::XML::Error
+          raise SourceFileInvalidError
+        end
+      end
+
+      # Callbacks can't be private, yet they are not part of the public API.
+
+      def on_start_element(element, attributes)
+        @current_element = element
+
+        if element == 'work'
+          @current_image = Models::Image.new
+        end
+
+        if element == 'url' && attributes['type'] == 'small'
+          @current_element = 'thumbnail URL'
+        end
+      end
+
+      def on_end_element(element)
+        if element == 'work'
+          @images << @current_image
+        end
+
+        if element == 'id'
+          @current_image.id = @current_id
+        end
+
+        if element == 'make'
+          @current_image.make = @current_make
+        end
+
+        if element == 'model'
+          @current_image.model = @current_model
+        end
+
+        if @current_element == 'thumbnail URL'
+          @current_image.src = @current_src
+        end
+
+        @current_element = nil
+      end
+
+      def on_characters(char)
+        if @current_element == 'id'
+          @current_id = char
+        end
+
+        if @current_element == 'make'
+          @current_make = char
+        end
+
+        if @current_element == 'model'
+          @current_model = char
+        end
+
+        if @current_element == 'thumbnail URL'
+          @current_src = char
+        end
+      end
+
+      def on_end_document
+        @current_element = nil
+      end
+    end
+  end
+end

data/lib/images_gallery/version.rb

@@ -1,3 +1,3 @@
 module ImagesGallery
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/images_gallery/views/base.rb

@@ -0,0 +1,57 @@
+require 'erb'
+
+module ImagesGallery
+  module Views
+    class Base
+
+      # Provides context and helpers to the corresponding template
+      #
+      # Any variable defined in the context of this class will be accessible
+      # from the corresponding ERb template.
+      # See http://ruby-doc.org/stdlib-2.2.2/libdoc/erb/rdoc/ERB.html#method-i-result
+      #
+      # Usage:
+      #
+      # Do not instanciate this class, define subclasses instead an define their
+      # template methods as demonstrated in Views::Index.
+      #
+      # Conventionally, templates could be stored in images_gallery/templates, but
+      # there is no obligation to follow the convention.
+      #
+      # This class not meant to be instanciated, subclasses do return View instances (kind of).
+      def initialize
+        @template = File.new(template)
+      end
+
+      def template
+        raise NotImplementedError
+      end
+
+      def render
+        ERB.new(File.new(template).read).result(binding)
+      end
+
+      def thumbnails(images)
+        template = File.expand_path('../../templates/_thumbnails.html.erb', __FILE__)
+        ERB.new(File.new(template).read).result(binding)
+      end
+
+      def navigation(links)
+        template = File.expand_path('../../templates/_navigation.html.erb', __FILE__)
+        ERB.new(File.new(template).read).result(binding)
+      end
+
+      def link_to(depth, make, model=nil)
+        ('../' * depth) + file_identifier(make, model) + '.html'
+      end
+
+      def file_identifier(make, model=nil)
+        if model.nil?
+          "#{make.to_filename}"
+        else
+          "#{make.to_filename}/#{model.to_filename}"
+        end
+      end
+    end
+  end
+end

data/lib/images_gallery/views/index.rb

@@ -1,10 +1,10 @@
 require 'erb'
 
-require 'images_gallery/view'
+require 'images_gallery/views/base'
 
 module ImagesGallery
   module Views
-    class Index < ImagesGallery::View
+    class Index < Base
 
       attr_reader :depth, :links, :sample_images, :title
       private :depth, :links, :sample_images, :title

data/lib/images_gallery/views/make.rb

@@ -1,10 +1,10 @@
 require 'erb'
 
-require 'images_gallery/view'
+require 'images_gallery/views/base'
 
 module ImagesGallery
   module Views
-    class Make < ImagesGallery::View
+    class Make < Base
 
       attr_reader :depth, :links, :make, :sample_images, :title
       private :depth, :links, :make, :sample_images, :title

data/lib/images_gallery/views/model.rb

@@ -1,10 +1,10 @@
 require 'erb'
 
-require 'images_gallery/view'
+require 'images_gallery/views/base'
 
 module ImagesGallery
   module Views
-    class Model < ImagesGallery::View
+    class Model < Base
 
       attr_reader :depth, :links, :make, :model, :sample_images, :title
       private :depth, :links, :make, :model, :sample_images, :title

data/spec/lib/images_gallery/cli_spec.rb

@@ -32,7 +32,7 @@ describe 'CLI' do
           stderr = double()
           allow(command_line_interface).to receive_message_chain(:generator, :run) { raise ImagesGallery::SourceFileNotFoundError }
 
-          expect(stderr).to receive_message_chain(:puts).with('Please make sure the specified source file exists.')
+          expect(stderr).to receive_message_chain(:puts).with('ERROR: Please make sure the specified source file exists.')
           command_line_interface.generate('source', 'target', stderr)
         end
       end
@@ -43,7 +43,7 @@ describe 'CLI' do
           stderr = double()
           allow(command_line_interface).to receive_message_chain(:generator, :run) { raise ImagesGallery::TargetDirectoryNotFoundError }
 
-          expect(stderr).to receive_message_chain(:puts).with('Please make sure the specified target directory exists.')
+          expect(stderr).to receive_message_chain(:puts).with('ERROR: Please make sure the specified target directory exists.')
           command_line_interface.generate('source', 'target', stderr)
         end
       end
@@ -54,7 +54,7 @@ describe 'CLI' do
           stderr = double()
           allow(command_line_interface).to receive_message_chain(:generator, :run) { raise ImagesGallery::SourceFileInvalidError }
 
-          expect(stderr).to receive_message_chain(:puts).with('The source file is invalid. Please check it is well-formed XML.')
+          expect(stderr).to receive_message_chain(:puts).with('ERROR: The source file is invalid. Please check it is well-formed XML.')
           command_line_interface.generate('source', 'target', stderr)
         end
       end

data/spec/lib/images_gallery/{collection_spec.rb → models/collection_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module ImagesGallery
-describe 'Collection' do
+describe 'Models::Collection' do
 
-  let(:collection) { Collection.new }
+  let(:collection) { Models::Collection.new }
 
   it_behaves_like 'a collection'
 

data/spec/lib/images_gallery/{image_spec.rb → models/image_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module ImagesGallery
-describe 'Image' do
+describe 'Models::Image' do
 
-  let(:image) { Image.new }
+  let(:image) { Models::Image.new }
 
   it_behaves_like 'an image'
 

data/spec/lib/images_gallery/{source_spec.rb → models/source_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module ImagesGallery
-describe 'Source' do
+describe 'Models::Source' do
 
-  let(:source) { Source.new('spec/fixtures/works.xml') }
+  let(:source) { Models::Source.new('spec/fixtures/works.xml') }
   let(:parser) { source }
 
   it_behaves_like 'a parser'

data/spec/lib/images_gallery/{view_spec.rb → views/base_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module ImagesGallery
-describe 'View' do
+describe 'Views::Base' do
 
-  let(:view) { View.new }
+  let(:view) { Views::Base.new }
 
   it 'does not define :template' do
     expect { view.template }.to raise_error NotImplementedError

data/spec/lib/images_gallery/views/index_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 module ImagesGallery
 describe 'Views::Index' do
 
-  let(:data) do
-    data = Collection.new
-    data << Image.new
-  end
-
+  let(:data) { images_collection }
   let(:view) { Views::Model.new(data) }
 
   it_behaves_like 'a view'

data/spec/lib/images_gallery/views/make_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 module ImagesGallery
 describe 'Views::Make' do
 
-  let(:data) do
-    data = Collection.new
-    data << Image.new
-  end
-
+  let(:data) { images_collection }
   let(:view) { Views::Model.new(data) }
 
   it_behaves_like 'a view'

data/spec/lib/images_gallery/views/model_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 module ImagesGallery
 describe 'Views::Model' do
 
-  let(:data) do
-    data = Collection.new
-    data << Image.new
-  end
-
+  let(:data) { images_collection }
   let(:view) { Views::Model.new(data) }
 
   it_behaves_like 'a view'

data/spec/support/helpers.rb

@@ -12,7 +12,14 @@ module Selectors
   end
 end
 
+module ViewHelpers
+  def images_collection
+    ImagesGallery::Models::Collection.new << ImagesGallery::Models::Image.new
+  end
+end
+
 RSpec.configure do |config|
   config.extend Selectors
   config.include Selectors
+  config.include ViewHelpers
 end

data/spec/tmp/canon/canon_eos_20d.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (Canon) Canon EOS 20D</title>
     <style type="text/css">
       html, body {

data/spec/tmp/canon/canon_eos_400d_digital.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (Canon) Canon EOS 400D DIGITAL</title>
     <style type="text/css">
       html, body {

data/spec/tmp/canon.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by Canon</title>
     <style type="text/css">
       html, body {

data/spec/tmp/fuji_photo_film_co_ltd/slp1000se.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (FUJI PHOTO FILM CO., LTD.) SLP1000SE</title>
     <style type="text/css">
       html, body {

data/spec/tmp/fuji_photo_film_co_ltd.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by FUJI PHOTO FILM CO., LTD.</title>
     <style type="text/css">
       html, body {

data/spec/tmp/fujifilm/finepix_s6500fd.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (FUJIFILM) FinePix S6500fd</title>
     <style type="text/css">
       html, body {

data/spec/tmp/fujifilm.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by FUJIFILM</title>
     <style type="text/css">
       html, body {

data/spec/tmp/index.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Index</title>
     <style type="text/css">
       html, body {

data/spec/tmp/leica/d_lux_3.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (LEICA) D-LUX 3</title>
     <style type="text/css">
       html, body {

data/spec/tmp/leica.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by LEICA</title>
     <style type="text/css">
       html, body {

data/spec/tmp/nikon_corporation/nikon_d80.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (NIKON CORPORATION) NIKON D80</title>
     <style type="text/css">
       html, body {

data/spec/tmp/nikon_corporation.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by NIKON CORPORATION</title>
     <style type="text/css">
       html, body {

data/spec/tmp/panasonic/dmc_fz30.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (Panasonic) DMC-FZ30</title>
     <style type="text/css">
       html, body {

data/spec/tmp/panasonic.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by Panasonic</title>
     <style type="text/css">
       html, body {

data/spec/tmp/unknown_make/unknown_model.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by (Unknown Make) Unknown Model</title>
     <style type="text/css">
       html, body {

data/spec/tmp/unknown_make.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>Images by Unknown Make</title>
     <style type="text/css">
       html, body {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: images_gallery
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gonzalo Bulnes Guilpain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -139,17 +139,17 @@ files:
 - config.ru
 - lib/images_gallery.rb
 - lib/images_gallery/cli.rb
-- lib/images_gallery/collection.rb
 - lib/images_gallery/errors.rb
 - lib/images_gallery/generator.rb
-- lib/images_gallery/image.rb
-- lib/images_gallery/source.rb
+- lib/images_gallery/models/collection.rb
+- lib/images_gallery/models/image.rb
+- lib/images_gallery/models/source.rb
 - lib/images_gallery/templates/_navigation.html.erb
 - lib/images_gallery/templates/_thumbnails.html.erb
 - lib/images_gallery/templates/layout.html.erb
 - lib/images_gallery/test_application.rb
 - lib/images_gallery/version.rb
-- lib/images_gallery/view.rb
+- lib/images_gallery/views/base.rb
 - lib/images_gallery/views/index.rb
 - lib/images_gallery/views/make.rb
 - lib/images_gallery/views/model.rb
@@ -162,11 +162,11 @@ files:
 - spec/fixtures/works.xml
 - spec/fixtures/works_large.xml
 - spec/lib/images_gallery/cli_spec.rb
-- spec/lib/images_gallery/collection_spec.rb
 - spec/lib/images_gallery/generator_spec.rb
-- spec/lib/images_gallery/image_spec.rb
-- spec/lib/images_gallery/source_spec.rb
-- spec/lib/images_gallery/view_spec.rb
+- spec/lib/images_gallery/models/collection_spec.rb
+- spec/lib/images_gallery/models/image_spec.rb
+- spec/lib/images_gallery/models/source_spec.rb
+- spec/lib/images_gallery/views/base_spec.rb
 - spec/lib/images_gallery/views/index_spec.rb
 - spec/lib/images_gallery/views/make_spec.rb
 - spec/lib/images_gallery/views/model_spec.rb
@@ -223,15 +223,15 @@ specification_version: 4
 summary: Generate efficient galleries of thumbnails from large XML representations
   of EXIF data.
 test_files:
-- spec/lib/images_gallery/view_spec.rb
 - spec/lib/images_gallery/generator_spec.rb
-- spec/lib/images_gallery/image_spec.rb
+- spec/lib/images_gallery/models/image_spec.rb
+- spec/lib/images_gallery/models/source_spec.rb
+- spec/lib/images_gallery/models/collection_spec.rb
 - spec/lib/images_gallery/cli_spec.rb
 - spec/lib/images_gallery/views/index_spec.rb
+- spec/lib/images_gallery/views/base_spec.rb
 - spec/lib/images_gallery/views/model_spec.rb
 - spec/lib/images_gallery/views/make_spec.rb
-- spec/lib/images_gallery/source_spec.rb
-- spec/lib/images_gallery/collection_spec.rb
 - spec/features/index_page_spec.rb
 - spec/features/models_pages/canon_eos_20d_page_spec.rb
 - spec/features/models_pages/lux_d_3_page_spec.rb

data/lib/images_gallery/collection.rb

@@ -1,15 +0,0 @@
-require 'images_gallery/image'
-
-module ImagesGallery
-  class Collection < Array
-
-    def makes
-      map { |image| image.make }.uniq.sort
-    end
-
-    def models
-      map { |image| image.model }.uniq.sort
-    end
-
-  end
-end

data/lib/images_gallery/image.rb

@@ -1,19 +0,0 @@
-module ImagesGallery
-  class Image
-
-    attr_accessor :id, :src, :make, :model
-
-    def make
-      @make || 'Unknown Make'
-    end
-
-    def model
-      @model || 'Unknown Model'
-    end
-
-    def description
-      "Image #{@id}"
-    end
-
-  end
-end

data/lib/images_gallery/source.rb

@@ -1,104 +0,0 @@
-require 'libxml'
-
-require 'images_gallery/collection'
-
-module ImagesGallery
-  class Source
-
-    include LibXML
-    include XML::SaxParser::Callbacks
-
-    attr_reader :images
-
-    # Provides a collection of images to presenters
-    #
-    # Extracts some images attributes from an XML collection of works
-    # and collects the images as plain Ruby objects so other classes
-    # can use them with presentational purpose.
-    #
-    # This class should be able to parse efficiently large XML files.
-    #
-    # file - Path to an XML representation of the images (metadata, EXIF)
-    #
-    # Example:
-    #
-    #     source = ImagesGallery::Source.new('path/to/source.xml')
-    #     source.parse   # creates a Collection of Images
-    #     source.images  # is available after parsing
-    #
-    # Returns a Source object, ready to parse the corresponding XML file.
-    def initialize(file)
-      @file = XML::SaxParser.file(file)
-      @file.callbacks = self
-    end
-
-    def parse
-      @images = Collection.new
-      begin
-        @file.parse
-      rescue LibXML::XML::Error
-        raise SourceFileInvalidError
-      end
-    end
-
-    # Callbacks can't be private, yet they are not part of the public API.
-
-    def on_start_element(element, attributes)
-      @current_element = element
-
-      if element == 'work'
-        @current_image = Image.new
-      end
-
-      if element == 'url' && attributes['type'] == 'small'
-        @current_element = 'thumbnail URL'
-      end
-    end
-
-    def on_end_element(element)
-      if element == 'work'
-        @images << @current_image
-      end
-
-      if element == 'id'
-        @current_image.id = @current_id
-      end
-
-      if element == 'make'
-        @current_image.make = @current_make
-      end
-
-      if element == 'model'
-        @current_image.model = @current_model
-      end
-
-      if @current_element == 'thumbnail URL'
-        @current_image.src = @current_src
-      end
-
-      @current_element = nil
-    end
-
-    def on_characters(char)
-      if @current_element == 'id'
-        @current_id = char
-      end
-
-      if @current_element == 'make'
-        @current_make = char
-      end
-
-      if @current_element == 'model'
-        @current_model = char
-      end
-
-      if @current_element == 'thumbnail URL'
-        @current_src = char
-      end
-    end
-
-    def on_end_document
-      @current_element = nil
-    end
-  end
-end

data/lib/images_gallery/view.rb

@@ -1,55 +0,0 @@
-require 'erb'
-
-module ImagesGallery
-  class View
-
-    # Provides context and helpers to the corresponding template
-    #
-    # Any variable defined in the context of this class will be accessible
-    # from the corresponding ERb template.
-    # See http://ruby-doc.org/stdlib-2.2.2/libdoc/erb/rdoc/ERB.html#method-i-result
-    #
-    # Usage:
-    #
-    # Do not instanciate this class, define subclasses instead an define their
-    # template methods as demonstrated in Views::Index.
-    #
-    # Conventionally, templates could be stored in images_gallery/templates, but
-    # there is no obligation to follow the convention.
-    #
-    # This class not meant to be instanciated, subclasses do return View instances (kind of).
-    def initialize
-      @template = File.new(template)
-    end
-
-    def template
-      raise NotImplementedError
-    end
-
-    def render
-      ERB.new(File.new(template).read).result(binding)
-    end
-
-    def thumbnails(images)
-      template = File.expand_path('../templates/_thumbnails.html.erb', __FILE__)
-      ERB.new(File.new(template).read).result(binding)
-    end
-
-    def navigation(links)
-      template = File.expand_path('../templates/_navigation.html.erb', __FILE__)
-      ERB.new(File.new(template).read).result(binding)
-    end
-
-    def link_to(depth, make, model=nil)
-      ('../' * depth) + file_identifier(make, model) + '.html'
-    end
-
-    def file_identifier(make, model=nil)
-      if model.nil?
-        "#{make.to_filename}"
-      else
-        "#{make.to_filename}/#{model.to_filename}"
-      end
-    end
-  end
-end