static_sync 0.1.6 → 0.1.7

data/README.md

@@ -32,9 +32,6 @@ In your project directory create a `.static` file:
 local:
   directory: build
 
-# What not to upload (ruby regular expression).
-ignored: (psd,gz)$
-
 # Where to upload
 remote:
   provider: AWS
@@ -43,12 +40,20 @@ remote:
   password: my-aws-secret
   directory: my-aws-bucket
 
+# Everything below this line is optional.
+
+# What not to upload (ruby regular expression).
+ignored: (psd,gz)$
+
 # Number of seconds to cache each content type, defaults to no cache.
 cache:
   html: 31536000
   javascript: 31536000
   css: 31536000
   image: 31536000
+
+# If you wish to strictly prevent modification of existing files.
+immutable_mode: false
 ```
 
 And simply run the following command any time you want to upload.

data/lib/static_sync/config.rb

@@ -7,6 +7,10 @@ module StaticSync
       self.fetch('log', true)
     end
 
+    def immutable_mode
+      self.fetch('immutable_mode', false)
+    end
+
     def cache
       self.fetch('cache', {})
     end
@@ -33,10 +37,6 @@ module StaticSync
       })
     end
 
-    def gzip
-      self.fetch('gzip', true)
-    end
-
     def ignored
       self['ignored']
     end

data/lib/static_sync/processor.rb

@@ -0,0 +1,70 @@
+require "fog"
+require "logger"
+
+require_relative "storage"
+require_relative "uploadable"
+
+module StaticSync
+  class Processor
+
+    class ImmutableError < StandardError
+    end
+
+    def initialize(config, storage = nil)
+      @config  = config
+      @storage = storage || StaticSync::Storage.new(config)
+    end
+
+    def sync
+      log.info("Synching #{@config.source} to #{@config.target}.") if @config.log
+      Dir.chdir(@config.source) do
+        local_filtered_files.each do |file|
+          current_file = Uploadable.new(file, @config)
+
+          unless @storage.has_version?(current_file.version)
+            if @storage.has_file?(current_file.version)
+              log.info("Overwriting #{file}") if @config.log
+              if @config.immutable_mode
+                raise ImmutableError, "immutable_mode does not allow modifications to existing files."
+              end
+            else
+              log.info("Uploading #{file}") if @config.log
+            end
+            begin
+              @storage.create(current_file.headers)
+            rescue => error
+              log.error("Failed to upload #{file}")
+              raise error
+            end
+          end
+        end
+      end
+      log.info("Synching done.") if @config.log
+    end
+
+    def local_filtered_files
+      local_files.reject do |file|
+        file =~ Regexp.new(@config.ignored) if @config.ignored
+      end
+    end
+
+    private
+
+    def local_files
+      Dir.glob("**/*.*").reject do |file|
+        File.directory?(file)
+      end
+    end
+
+    def log
+      @log ||= begin
+        logger = Logger.new(STDOUT)
+        logger.formatter = proc do |severity, datetime, progname, msg|
+            "#{datetime}: #{severity} -- #{msg}\n"
+        end
+        logger
+      end
+    end
+
+  end
+end

data/lib/static_sync/storage.rb

@@ -1,73 +1,49 @@
 require "fog"
 require "logger"
 
-require_relative "meta"
-
 module StaticSync
   class Storage
 
+    class Version < Struct.new(:path, :etag)
+    end
+
     def initialize(config)
       @config = config
-      @meta   = Meta.new(config)
-    end
 
-    def sync
-      log.info("Synching #{@config.source} to #{@config.target}.") if @config.log
-      verify_remote_directory
-      remote_keys = []
-      remote_directory.files.each do |file|
-        remote_keys << [file.key, file.etag]
-      end
-      Dir.chdir(@config.source) do
-        local_filtered_files.each do |file|
-          current_file     = @meta.for(file)
-          current_file_key = [current_file[:key], current_file[:etag]]
+      validate_credentials!
+    end
 
-          unless remote_keys.include?(current_file_key)
-            log.info("Uploading #{file}") if @config.log
-            begin
-              remote_directory.files.create(current_file)
-            rescue => error
-              log.error("Failed to upload #{file}")
-              raise error
-            end
-          end
-        end
-      end
-      log.info("Synching done.") if @config.log
+    def has_file?(version)
+      file_versions.map(&:path).include?(version.path)
     end
 
-    private
+    def has_version?(version)
+      file_versions.include?(version)
+    end
 
-    def local_filtered_files
-      local_files.reject do |file|
-        file =~ Regexp.new(@config.ignored) if @config.ignored
+    def file_versions
+      @file_versions ||= begin
+        result = []
+        remote_directory.files.each do |file|
+          result << Version.new(file.key, file.etag)
+        end
+        result
       end
     end
 
-    def local_files
-      Dir.glob("**/*.*").reject do |file|
-        File.directory?(file)
-      end
+    def create(headers)
+      remote_directory.files.create(headers)
     end
 
+    private
+
     def remote_directory
       @config.storage.directories.new(:key => @config.target)
     end
 
-    def verify_remote_directory
+    def validate_credentials!
       @config.storage.get_bucket(@config.target)
     end
 
-    def log
-      @log ||= begin
-        logger = Logger.new(STDOUT)
-        logger.formatter = proc do |severity, datetime, progname, msg|
-            "#{datetime}: #{severity} -- #{msg}\n"
-        end
-        logger
-      end
-    end
-
   end
 end

data/lib/static_sync/uploadable.rb

@@ -0,0 +1,96 @@
+require "cgi"
+require "digest/md5"
+require "mime/types"
+require "tempfile"
+require "zlib"
+
+require_relative "storage"
+
+module StaticSync
+  class Uploadable < Struct.new(:path, :config)
+
+    def version
+      Storage::Version.new(path, etag)
+    end
+
+    def mime
+      MIME::Types::of(path).first
+    end
+
+    def content_type
+      if mime
+        MIME::Type.simplified(mime)
+      end
+    end
+
+    def gzipped?
+      mime && mime.ascii?
+    end
+
+    def content_encoding
+      if gzipped?
+        'gzip'
+      end
+    end
+
+    def cache_time
+      if mime
+        type = mime.sub_type
+        type = mime.media_type if mime.media_type == "image"
+        if config.cache.has_key?(type)
+          return config.cache[type].to_i
+        end
+      end
+    end
+
+    def content
+      @content ||= begin
+        result = File.open(path, 'rb') { |f| f.read }
+        if gzipped?
+          result = File.open(gzip(result), 'rb') { |f| f.read }
+        end
+        result
+      rescue
+        ""
+      end
+    end
+
+    def etag
+      @etag ||= Digest::MD5.hexdigest(content)
+    end
+
+    def md5
+      @md5 ||= Digest::MD5.base64digest(content)
+    end
+
+    def headers
+      base_headers = {
+        :key           => path,
+        :body          => content,
+        :etag          => etag,
+        :content_md5   => md5,
+        :storage_class => 'REDUCED_REDUNDANCY',
+        :public        => true
+      }
+      base_headers.merge!(:cache_control    => "public, max-age=#{cache_time}")         if cache_time
+      base_headers.merge!(:content_type     => content_type)                            if content_type
+      base_headers.merge!(:content_encoding => content_encoding)                        if content_encoding
+      base_headers.merge!(:expires          => CGI.rfc1123_date(Time.now + cache_time)) if cache_time
+      base_headers
+    end
+
+    private
+
+    def gzip(content)
+      zipped = Tempfile.new("static_sync")
+      Zlib::GzipWriter.open(zipped) do |archive|
+        # Gzip by default incorporates file creation time into the content.
+        # For the purpose of repeatable etag comparison we want avoid this.
+        archive.mtime = 1
+        archive.write content
+      end
+      zipped
+    end
+
+  end
+end

data/lib/static_sync/version.rb

@@ -1,3 +1,3 @@
 module StaticSync
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/static_sync.rb

@@ -1,9 +1,9 @@
 require_relative "static_sync/version"
 require_relative "static_sync/config"
-require_relative "static_sync/storage"
+require_relative "static_sync/processor"
 
 module StaticSync
   def self.upload(config = {})
-    Storage.new(Config.new.load.merge(config)).sync
+    Processor.new(Config.new.load.merge(config)).sync
   end
 end

data/spec/processor_spec.rb

@@ -0,0 +1,40 @@
+require "./lib/static_sync/config"
+require "./lib/static_sync/processor"
+
+describe StaticSync::Processor do
+
+  let(:config) do
+    StaticSync::Config.new.merge({
+      'log' => false,
+      'local' => {
+        'directory' => 'spec/fixtures/site'
+      }
+    })
+  end
+
+  let(:storage) { stub }
+
+  subject do
+    StaticSync::Processor.new(config, storage)
+  end
+
+  describe "#local_filtered_files" do
+
+    before do
+      config.merge!(
+        'ignored' => '(css|gif)$'
+      )
+    end
+
+    it "does not include files matching the ignore regex" do
+      Dir.chdir(config.source) do
+        subject.local_filtered_files.should == [
+          "assets/javascripts/jquery.min.js",
+          "cat.com/index.html",
+          "index.html"
+        ]
+      end
+    end
+
+  end
+end

data/spec/uploadable_spec.rb

@@ -0,0 +1,131 @@
+require "timecop"
+
+require "./lib/static_sync/config"
+require "./lib/static_sync/uploadable"
+
+describe StaticSync::Uploadable do
+
+  let(:config)        { StaticSync::Config.new }
+
+  subject(:html_file) { StaticSync::Uploadable.new("index.html", config) }
+  subject(:text_file) { StaticSync::Uploadable.new("data.txt", config) }
+  subject(:css_file)  { StaticSync::Uploadable.new("screen.css", config) }
+  subject(:gif_file)  { StaticSync::Uploadable.new("spinner.gif", config) }
+  subject(:png_file)  { StaticSync::Uploadable.new("background.png", config) }
+
+  describe "#headers" do
+
+    it "should make all files viewable by everyone" do
+      html_file.headers[:public].should be_true
+    end
+
+    it "should reduce storage costs for all files" do
+      html_file.headers[:storage_class].should == "REDUCED_REDUNDANCY"
+    end
+
+    it "should set the content type header for html files" do
+      html_file.headers[:content_type].should == "text/html"
+    end
+
+    it "should set the content type header for png files" do
+      png_file.headers[:content_type].should == "image/png"
+    end
+
+    it "should set the content encoding header for html files" do
+      html_file.headers[:content_encoding].should == "gzip"
+    end
+
+    it "should not set the content encoding header for png files" do
+      png_file.headers[:content_encoding].should be_nil
+    end
+
+    it "should set a content md5 header for html files" do
+      html_file.headers[:content_md5].should == "1B2M2Y8AsgTpgAmY7PhCfg=="
+    end
+
+    it "should set an etag header for html files" do
+      html_file.headers[:etag].should == "d41d8cd98f00b204e9800998ecf8427e"
+    end
+
+    context "when caching is enabled for html" do
+
+      before do
+        config['cache'] = { 'html' => 60 * 60 * 24 * 365 }
+      end
+
+      before do
+        Timecop.freeze(Time.local(2010))
+      end
+
+      it "sets the cache control header for html files" do
+        html_file.headers[:cache_control].should == "public, max-age=31536000"
+      end
+
+      it "sets the expires header for html files " do
+        html_file.headers[:expires].should == "Fri, 31 Dec 2010 13:00:00 GMT"
+      end
+    end
+
+  end
+
+  describe "#cache_time" do
+
+    context "when caching is disabled" do
+
+      before do
+        config['cache'] = { }
+      end
+
+      it "is nil for html files" do
+        html_file.cache_time.should be_nil
+      end
+    end
+
+    context "when caching is enabled for html" do
+
+      before do
+        config['cache'] = { 'html' => '86400' }
+      end
+
+      it "is the configured value for html files" do
+        html_file.cache_time.should == 86400
+      end
+
+      it "is the configured value for text files" do
+        text_file.cache_time.should be_nil
+      end
+
+      it "is nil for css files" do
+        css_file.cache_time.should be_nil
+      end
+    end
+
+    context "when caching is enabled for images" do
+
+      before do
+        config['cache'] = { 'image' => '86400' }
+      end
+
+      it "is the configured value for gif files" do
+        gif_file.cache_time.should == 86400
+      end
+
+      it "is the configured value for png files" do
+        png_file.cache_time.should == 86400
+      end
+    end
+
+  end
+
+  describe "#gzipped?" do
+
+    it "is true for html files" do
+      html_file.gzipped?.should be_true
+    end
+
+    it "is false for png files" do
+      png_file.gzipped?.should be_false
+    end
+
+  end
+end

data/static_sync.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency("fog", [">= 1.5.0"])
 
   gem.add_development_dependency('rspec')
+  gem.add_development_dependency('timecop')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - shanonmcquay@gmail.com
@@ -59,10 +75,9 @@ files:
 - bin/static_sync
 - lib/static_sync.rb
 - lib/static_sync/config.rb
-- lib/static_sync/meta.rb
-- lib/static_sync/meta/caching.rb
-- lib/static_sync/meta/compression.rb
+- lib/static_sync/processor.rb
 - lib/static_sync/storage.rb
+- lib/static_sync/uploadable.rb
 - lib/static_sync/version.rb
 - spec/fixtures/site/assets/images/spinner.gif
 - spec/fixtures/site/assets/javascripts/jquery.min.js
@@ -70,10 +85,8 @@ files:
 - spec/fixtures/site/assets/stylesheets/screen.scss
 - spec/fixtures/site/cat.com/index.html
 - spec/fixtures/site/index.html
-- spec/meta/caching_spec.rb
-- spec/meta/compression_spec.rb
-- spec/meta_spec.rb
-- spec/storage_spec.rb
+- spec/processor_spec.rb
+- spec/uploadable_spec.rb
 - static_sync.gemspec
 homepage: 
 licenses: []
@@ -100,7 +113,5 @@ signing_key:
 specification_version: 3
 summary: Command line tool for uploading static websites to amazon/rackspace.
 test_files:
-- spec/meta/caching_spec.rb
-- spec/meta/compression_spec.rb
-- spec/meta_spec.rb
-- spec/storage_spec.rb
+- spec/processor_spec.rb
+- spec/uploadable_spec.rb

data/lib/static_sync/meta/caching.rb

@@ -1,27 +0,0 @@
-require 'cgi'
-
-module StaticSync
-  class Meta
-    class Caching
-
-      def initialize(config)
-        @config = config
-      end
-
-      def for(file, mime)
-        meta = {}
-        type = mime.sub_type
-        type = mime.media_type if mime.media_type == "image"
-        if @config.cache.has_key?(type)
-          expiry = @config.cache[type].to_i
-          meta.merge!(
-            :cache_control => "public, max-age=#{expiry}",
-            :expires       => CGI.rfc1123_date(Time.now + expiry)
-          )
-        end
-        meta
-      end
-
-    end
-  end
-end

data/lib/static_sync/meta/compression.rb

@@ -1,38 +0,0 @@
-require "tempfile"
-require "zlib"
-
-module StaticSync
-  class Meta
-    class Compression
-
-      def initialize(config)
-        @config = config
-      end
-
-      def for(file, mime)
-        meta = {}
-        if @config.gzip && !mime.binary?
-          meta.merge!(
-            :body             => gzip(file),
-            :content_encoding => 'gzip'
-          )
-        end
-        meta
-      end
-
-      private
-
-      def gzip(file)
-        zipped = Tempfile.new("static_sync")
-        Zlib::GzipWriter.open(zipped) do |archive|
-          # Gzip by default incorporates file creation time into the content.
-          # For the purpose of repeatable etag comparison we want avoid this.
-          archive.mtime = 1
-          archive.write File.read(file)
-        end
-        zipped
-      end
-
-    end
-  end
-end

data/lib/static_sync/meta.rb

@@ -1,43 +0,0 @@
-require "digest/md5"
-require "mime/types"
-
-require_relative "meta/caching"
-require_relative "meta/compression"
-
-module StaticSync
-  class Meta
-
-    def initialize(config)
-      @config      = config
-      @compression = Compression.new(@config)
-      @caching     = Caching.new(@config)
-    end
-
-    def for(file)
-      meta = {
-        :key                => file,
-        :body               => File.new(file),
-        :public             => true,
-        :storage_class      => 'REDUCED_REDUNDANCY'
-      }
-
-      mime = MIME::Types::of(file).first
-
-      if mime
-        meta.merge!(
-          :content_type => MIME::Type.simplified(mime)
-        )
-        meta.merge!(@compression.for(file, mime))
-        meta.merge!(@caching.for(file, mime))
-      end
-
-      body = meta[:body].read
-
-      meta.merge!(
-        :etag        => Digest::MD5.hexdigest(body),   # A local version of the etag expected after upload.
-        :content_md5 => Digest::MD5.base64digest(body) # Enable checksum validation during uploads.
-      )
-    end
-
-  end
-end

data/spec/meta/caching_spec.rb

@@ -1,79 +0,0 @@
-require "mime/types"
-require "./lib/static_sync/config"
-require "./lib/static_sync/meta/caching"
-
-describe StaticSync::Meta::Caching do
-
-  let(:config) { StaticSync::Config.new }
-
-  let(:html)   { MIME::Type.new('text/html') }
-  let(:plain)  { MIME::Type.new('text/plain') }
-  let(:css)    { MIME::Type.new('text/css') }
-  let(:gif)    { MIME::Type.new('image/gif') }
-  let(:jpg)    { MIME::Type.new('image/jpg') }
-  let(:png)    { MIME::Type.new('image/png') }
-
-  subject do
-    StaticSync::Meta::Caching.new(config)
-  end
-
-  context "when caching is completely disabled" do
-
-    before do
-      config['cache'] = { }
-    end
-
-    describe "#for" do
-      it "does not set cache headers for html files" do
-        subject.for("index.html", html).should_not include(:cache_control)
-      end
-    end
-  end
-
-  context "when caching is enabled for html only" do
-
-    before do
-      config['cache'] = { 'html' => '86400' }
-    end
-
-    describe "#for" do
-      it "sets cache headers for html files" do
-        subject.for("index.html", html).should include(:cache_control)
-      end
-
-      it "sets expires headers for html files" do
-        subject.for("index.html", html).should include(:expires)
-      end
-
-      it "does not set cache headers for text files" do
-        subject.for("data.txt", plain).should_not include(:cache_control)
-      end
-
-      it "does not set cache headers for css files" do
-        subject.for("screen.css", css).should_not include(:cache_control)
-      end
-    end
-  end
-
-  context "when caching is enabled for images" do
-
-    before do
-      config['cache'] = { 'image' => '86400' }
-    end
-
-    describe "#for" do
-      it "sets cache headers for gif files" do
-        subject.for("spinner.gif", gif).should include(:cache_control)
-      end
-
-      it "sets cache headers for jpg files" do
-        subject.for("kitten.jpg", jpg).should include(:cache_control)
-      end
-
-      it "sets cache headers for png files" do
-        subject.for("cat.png", png).should include(:cache_control)
-      end
-    end
-  end
-
-end

data/spec/meta/compression_spec.rb

@@ -1,50 +0,0 @@
-require "mime/types"
-require "./lib/static_sync/config"
-require "./lib/static_sync/meta/compression"
-
-describe StaticSync::Meta::Compression do
-
-  let(:config) { StaticSync::Config.new }
-
-  let(:html)   { MIME::Type.new('text/html') }
-  let(:image)  { MIME::Type.new('image/gif') }
-
-  subject do
-    StaticSync::Meta::Compression.new(config)
-  end
-
-  before do
-    File.stub(:read).and_return("")
-  end
-
-  context "when compression is disabled" do
-
-    before do
-      config['gzip'] = false
-    end
-
-    describe "#for" do
-      it "does not set compression headers for html files" do
-        subject.for("index.html", html).should_not include(:content_encoding => "gzip")
-      end
-    end
-  end
-
-  context "when compression is enabled" do
-
-    before do
-      config['gzip'] = true
-    end
-
-    describe "#for" do
-      it "sets compression headers for html files" do
-        subject.for("index.html", html).should include(:content_encoding => "gzip")
-      end
-
-      it "does not set compression headers for binary files" do
-        subject.for("assets/images/spinner.gif", image).should_not include(:content_encoding => "gzip")
-      end
-    end
-  end
-
-end

data/spec/meta_spec.rb

@@ -1,50 +0,0 @@
-require "./lib/static_sync/config"
-require "./lib/static_sync/meta"
-
-describe StaticSync::Meta do
-
-  let(:config) { StaticSync::Config.new }
-
-  subject do
-    StaticSync::Meta.new(config)
-  end
-
-  it "sets files as public" do
-    Dir.chdir("spec/fixtures/site") do
-      subject.for("index.html").should include(:public => true)
-    end
-  end
-
-  it "sets appropriate content types for a range of common file types" do
-    Dir.chdir("spec/fixtures/site") do
-      subject.for("index.html").should                       include(:content_type => "text/html")
-      subject.for("assets/images/spinner.gif").should        include(:content_type => "image/gif")
-      subject.for("assets/stylesheets/screen.css").should    include(:content_type => "text/css")
-      subject.for("assets/javascripts/jquery.min.js").should include(:content_type => "application/javascript")
-    end
-  end
-
-  describe "all files" do
-
-    it "should be public" do
-      Dir.chdir("spec/fixtures/site") do
-        subject.for("index.html").should include(
-          :key          => "index.html",
-          :content_type => "text/html",
-          :public       => true
-        )
-        subject.for("assets/stylesheets/screen.css").should include(
-          :key          => "assets/stylesheets/screen.css",
-          :content_type => "text/css",
-          :public       => true
-        )
-        subject.for("assets/javascripts/jquery.min.js").should include(
-          :key          => "assets/javascripts/jquery.min.js",
-          :content_type => "application/javascript",
-          :public       => true
-        )
-      end
-    end
-
-  end
-end

data/spec/storage_spec.rb

@@ -1,84 +0,0 @@
-require "./lib/static_sync/config"
-require "./lib/static_sync/storage"
-
-describe StaticSync::Storage do
-
-  let(:config) do
-    StaticSync::Config.new.merge({
-      'log' => false,
-      'local' => {
-        'directory' => 'spec/fixtures/site'
-      },
-      'remote' => {
-        'provider'  => 'AWS',
-        'username'  => 'lol',
-        'password'  => 'cat',
-        'directory' => 'bucket'
-      }
-    })
-  end
-
-  subject do
-    StaticSync::Storage.new(config)
-  end
-
-  before do
-    Fog.mock!
-  end
-
-  after do
-    Fog::Mock.reset
-  end
-
-  context "with a remote storage directory" do
-
-    before do
-      config.storage.directories.create(
-        :key    => config.storage_directory,
-        :public => true
-      )
-    end
-
-    context "syncing a new site" do
-
-      describe "#sync" do
-
-        it "sets a unique key for each uploaded file" do
-          subject.sync
-
-          config.storage.directories.get(config.storage_directory).files.map(&:key).should == [
-            "assets/images/spinner.gif",
-            "assets/javascripts/jquery.min.js",
-            "assets/stylesheets/screen.css",
-            "assets/stylesheets/screen.scss",
-            "cat.com/index.html",
-            "index.html"
-          ]
-        end
-      end
-    end
-
-    context "synching ignored files" do
-
-      describe "#sync" do
-
-        before do
-          config.merge!(
-            'ignored' => '(css|gif)$'
-          )
-        end
-
-        it "does not upload them" do
-          subject.sync
-
-          config.storage.directories.get(config.storage_directory).files.map(&:key).should == [
-            "assets/javascripts/jquery.min.js",
-            "cat.com/index.html",
-            "index.html"
-          ]
-        end
-      end
-    end
-
-  end
-end