configure-s3-website 1.2.0 → 1.3.0

data/lib/configure-s3-website/version.rb

@@ -1,3 +1,3 @@
 module ConfigureS3Website
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/configure-s3-website/xml_helper.rb

@@ -0,0 +1,15 @@
+module ConfigureS3Website
+  class XmlHelper
+    def self.hash_to_api_xml(hash={}, indent=0)
+      "".tap do |body|
+        hash.each do |key, value|
+          key_name = key.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/) { $2.capitalize }
+          value = value.is_a?(Hash) ? self.hash_to_api_xml(value, indent+1) : value
+          body << "\n"
+          body << " " * indent * 2 # 2-space indentation formatting for xml
+          body << "<#{key_name}>#{value}</#{key_name}>"
+        end
+      end
+    end
+  end
+end

data/spec/config_source/file_config_source_spec.rb

@@ -0,0 +1,22 @@
+require 'rspec'
+require 'configure-s3-website'
+
+describe ConfigureS3Website::FileConfigSource do
+  let(:yaml_file_path) {
+    'spec/sample_files/_config_file_with_eruby.yml'
+  }
+
+  let(:config_source) {
+    ConfigureS3Website::FileConfigSource.new(yaml_file_path)
+  }
+
+  it 'can parse files that contain eRuby code' do
+    config_source.s3_access_key_id.should eq('hello world')
+    config_source.s3_secret_access_key.should eq('secret world')
+    config_source.s3_bucket_name.should eq('my-bucket')
+  end
+
+  it 'returns the yaml file path as description' do
+    config_source.description.should eq(yaml_file_path)
+  end
+end

data/spec/s3_client_spec.rb

@@ -23,7 +23,7 @@ describe ConfigureS3Website::S3Client do
     }
 
     it 'calls the S3 api without request body' do
-      ConfigureS3Website::S3Client.should_receive(:call_s3_api).
+      ConfigureS3Website::HttpHelper.should_receive(:call_s3_api).
         with(anything(), anything(), '', anything())
       ConfigureS3Website::S3Client.send(:create_bucket,
                                         config_source)
@@ -38,7 +38,7 @@ describe ConfigureS3Website::S3Client do
     }
 
     it 'calls the S3 api with location constraint XML' do
-      ConfigureS3Website::S3Client.should_receive(:call_s3_api).
+      ConfigureS3Website::HttpHelper.should_receive(:call_s3_api).
         with(anything(), anything(),
         %|
           <CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">

data/spec/xml_helper_spec.rb

@@ -0,0 +1,39 @@
+require 'rspec'
+require 'configure-s3-website'
+
+describe ConfigureS3Website::XmlHelper do
+  context '#hash_to_api_xml' do
+    it 'returns an empty string, if the hash is empty' do
+      str = ConfigureS3Website::XmlHelper.send(:hash_to_api_xml,
+                                        { })
+      str.should eq('')
+    end
+
+    it 'capitalises hash keys but not values' do
+      str = ConfigureS3Website::XmlHelper.send(:hash_to_api_xml,
+                                        { 'key' => 'value' })
+      str.should eq("\n<Key>value</Key>")
+    end
+
+    it 'removes underscores and capitalises the following letter' do
+      str = ConfigureS3Website::XmlHelper.send(:hash_to_api_xml,
+                                        { 'hello_key' => 'value' })
+      str.should eq("\n<HelloKey>value</HelloKey>")
+    end
+
+    it 'can handle hash values as well' do
+      str = ConfigureS3Website::XmlHelper.send(:hash_to_api_xml,
+                                        { 'key' => { 'subkey' => 'subvalue' } })
+      str.should eq("\n<Key>\n  <Subkey>subvalue</Subkey></Key>")
+    end
+
+    it 'indents' do
+      str = ConfigureS3Website::XmlHelper.send(
+        :hash_to_api_xml,
+        { 'key' => { 'subkey' => 'subvalue' } },
+        indent = 1
+      )
+      str.should eq("\n  <Key>\n    <Subkey>subvalue</Subkey></Key>")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configure-s3-website
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,26 +142,36 @@ files:
 - features/cassettes/cucumber_tags/bucket-does-not-exist-in-tokyo.yml
 - features/cassettes/cucumber_tags/bucket-does-not-exist.yml
 - features/cassettes/cucumber_tags/bucket-exists.yml
+- features/cassettes/cucumber_tags/create-cf-dist.yml
 - features/cassettes/cucumber_tags/redirects.yml
 - features/config_file.feature
 - features/configure_bucket.feature
+- features/create_cloudfront_dist.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/support/sample_config_files/config_with_cloudfront_distribution_id.yml
+- features/support/sample_config_files/create_cf_dist.yml
 - features/support/sample_config_files/endpoint_tokyo.yml
 - features/support/sample_config_files/redirects.yml
 - features/support/sample_config_files/s3_config_with_existing_bucket.yml
 - features/support/sample_config_files/s3_config_with_non-existing_bucket.yml
 - features/support/vcr.rb
 - lib/configure-s3-website.rb
+- lib/configure-s3-website/cli.rb
+- lib/configure-s3-website/cloudfront_client.rb
 - lib/configure-s3-website/config_source/config_source.rb
 - lib/configure-s3-website/config_source/file_config_source.rb
+- lib/configure-s3-website/http_helper.rb
+- lib/configure-s3-website/runner.rb
 - lib/configure-s3-website/s3_client.rb
 - lib/configure-s3-website/version.rb
-- spec/config_extractor/file_config_extractor_spec.rb
+- lib/configure-s3-website/xml_helper.rb
+- spec/config_source/file_config_source_spec.rb
 - spec/s3_client_spec.rb
 - spec/sample_files/_config_file.yml
 - spec/sample_files/_config_file_oregon.yml
 - spec/sample_files/_config_file_with_eruby.yml
+- spec/xml_helper_spec.rb
 homepage: https://github.com/laurilehmijoki/configure-s3-website
 licenses: []
 post_install_message: 
@@ -176,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1020516680573187683
+      hash: -2014890720503017169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1020516680573187683
+      hash: -2014890720503017169
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -196,18 +206,23 @@ test_files:
 - features/cassettes/cucumber_tags/bucket-does-not-exist-in-tokyo.yml
 - features/cassettes/cucumber_tags/bucket-does-not-exist.yml
 - features/cassettes/cucumber_tags/bucket-exists.yml
+- features/cassettes/cucumber_tags/create-cf-dist.yml
 - features/cassettes/cucumber_tags/redirects.yml
 - features/config_file.feature
 - features/configure_bucket.feature
+- features/create_cloudfront_dist.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/support/sample_config_files/config_with_cloudfront_distribution_id.yml
+- features/support/sample_config_files/create_cf_dist.yml
 - features/support/sample_config_files/endpoint_tokyo.yml
 - features/support/sample_config_files/redirects.yml
 - features/support/sample_config_files/s3_config_with_existing_bucket.yml
 - features/support/sample_config_files/s3_config_with_non-existing_bucket.yml
 - features/support/vcr.rb
-- spec/config_extractor/file_config_extractor_spec.rb
+- spec/config_source/file_config_source_spec.rb
 - spec/s3_client_spec.rb
 - spec/sample_files/_config_file.yml
 - spec/sample_files/_config_file_oregon.yml
 - spec/sample_files/_config_file_with_eruby.yml
+- spec/xml_helper_spec.rb

data/spec/config_extractor/file_config_extractor_spec.rb

@@ -1,11 +0,0 @@
-require 'rspec'
-require 'configure-s3-website'
-
-describe ConfigureS3Website::FileConfigSource do
-  it 'can parse files that contain eRuby code' do
-    extractor = ConfigureS3Website::FileConfigSource.new('spec/sample_files/_config_file_with_eruby.yml')
-    extractor.s3_access_key_id.should eq('hello world')
-    extractor.s3_secret_access_key.should eq('secret world')
-    extractor.s3_bucket_name.should eq('my-bucket')
-  end
-end