statixite 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0cd53b7f1594a10523da4b8896e6ba08e817d2
-  data.tar.gz: 80e01358dee7cacdfef413849d816abe21833c7b
+  metadata.gz: 40af4523487d193d339cddcd57f28599b907c605
+  data.tar.gz: e83d1595472cfda90c160bf5c96a319c334bdbba
 SHA512:
-  metadata.gz: bf998c07bd46b128f32f3a02525d17aad5548d22606ebc84fcf9ea3204096e5d2dd954f9b59d5a5f5eee33ff3bc7976ad45a411c7172ec49226c34a6381b9c36
-  data.tar.gz: 9859e0f7e2e879825816fe9e0508cd55829572e8154d81383554977a7a6f328938062944f67cc102a982b5c3b2370efbef849701b26d70198b946bc4bb37cd24
+  metadata.gz: f214ea7e9aa72d3553c53f5c193642629de347097c8a9ab36a7e422f5dfa794d3960cda0ffd25141d87f6c155492fb40f31a4d7ff09db0e894e8d39c3543f5b9
+  data.tar.gz: 929f0b275aa6e4cdc5e3571126917ebbaf526d1a85ddad04a5d925187758da22394bbbe092c63325a2e7aeebf1aceeabc69dbd66c39ebcde0cd20b6a15823606

data/README.rdoc

@@ -57,8 +57,8 @@ This will generate the following file:
     # }
 
     # fog creds Rackspace Cloud Files example
-    # config.fog_credentials {
-    #   :provider                 => 'Rackspace',
+    # config.fog_credentials = {
+    #   :provider            => 'Rackspace',
     #   :rackspace_username  => ENV['RACKSPACE_USERNAME'],
     #   :rackspace_api_key   => ENV['RACKSPACE_API_KEY'],
     #   :rackspace_region    => :dfw
@@ -130,7 +130,7 @@ Fog is a cloud service Ruby gem that can allow you to deploy sites to cloud cont
   config.deploy_sites_to = :fog
 
   # Amazon S3 example
-  config.fog_crednentials {
+  config.fog_crednentials = {
     :provider                 => 'AWS',
     :aws_access_key_id        => ENV["AWS_ACCESS_KEY_ID"],
     :aws_secret_access_key    => ENV["AWS_SECRET_ACCESS_KEY"],

data/app/views/statixite/deployments/_modal.html.haml

@@ -12,7 +12,6 @@
             = fields_for @site do |s|
               = s.label :domain_name
               = s.text_field :domain_name, placeholder: 'example.com', class: 'form-control'
-          %p.help-block Every site is entitled to a statixite.com subdomain.  Yours is <strong>#{@site.statixite_name}</strong>.  In order for your custom domain to work, you will need to create a CNAME record.  A hostname will be created after the first deployment which you can find on the #{link_to("settings page", settings_site_path(@site))}.  If you would like to use a naked domain, then you may use <a href="https://dnsimple.com" target="_blank">DNSimple</a>, or use a naked domain redirect service provided by <a href="http://wwwizer.com/" target="_blank">wwwizer.com</a>
         .modal-footer
           %button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} Cancel
           %button.btn.btn-primary{"data-dismiss" => "modal", type: "submit", 'v-on': 'click: addDeployment($event, true)'} Deploy

data/app/views/statixite/deployments/index.html.haml

@@ -5,6 +5,12 @@
     %small
       = link_to "http://#{@site.domain_name}", target: "_blank" do
         %span.glyphicon.glyphicon-new-window
+- elsif @site.hostname.present?
+  %h1
+    Deployments for #{@site.hostname}
+    %small
+      = link_to "http://#{@site.hostname}", target: "_blank" do
+        %span.glyphicon.glyphicon-new-window
 - else
   %h1
     Deployments for #{@site.statixite_name}

data/app/views/statixite/sites/build_and_preview.html.haml

@@ -8,17 +8,3 @@
     %p
       The preview for #{@site.statixite_name} is ready and available at
       = link_to @site.preview_url, @site.preview_url, :target => "_blank"
-    %p Site previews use a different authentication method.  Feel free to change the login information below.
-    - if @password
-      %p You may use the following credentials to view the preview of your site.  This will be the only time the password is available for viewing, but you may update the login credentials at anytime.
-      %strong login: #{@site.site_name}
-      %br
-      %strong password: #{@password}
-      %br
-      %br
-.row
-  .col-sm-4
-    = bootstrap_form_tag url: preview_credentials_site_path(@site) do |f|
-      = f.text_field :login
-      = f.password_field :password
-      = f.submit

data/app/views/statixite/sites/settings.html.haml

@@ -62,7 +62,7 @@
   = stylesheet_link_tag "jsoneditor/dist/jsoneditor"
 %h1 Settings for #{@site.statixite_name}
 %hr
-%p The settings found here are equivalent to the settings found in a <kbd>_config.yml</kbd> file for a typical Jekyll Site.  To use a custom domain, enter it here.  Once you deploy your site for the first time, a hostname will be created.  Use this hostname for create a cname for your domain.  If you would like to use a naked domain, then you may use <a href="https://dnsimple.com" target="_blank">DNSimple</a>, or use a naked domain redirect service provided by <a href="http://wwwizer.com/" target="_blank">wwwizer.com</a>. 
+%p The settings found here are equivalent to the settings found in a <kbd>_config.yml</kbd> file for a typical Jekyll Site.  To use a custom domain, enter it here.  Once you deploy your site for the first time, a hostname will be created for configurations that use Amazon S3 or Rackspace Cloud Files.  Use this hostname for create a cname for your domain.  If you would like to use a naked domain, then you may use <a href="https://dnsimple.com" target="_blank">DNSimple</a>, or use a naked domain redirect service provided by <a href="http://wwwizer.com/" target="_blank">wwwizer.com</a>.  Github Pages deployments will automatically set your baseurl setting to equal "/statixite-#{@site.site_name}"
 
 #jsoneditor
 %br
@@ -70,8 +70,16 @@
   .form-group
     .col-sm-8
       = f.text_field :domain_name, label: 'Domain Name', placeholder: 'example.com', label_col: "col-sm-4", control_col: "col-sm-8"
+    .col-sm-4
+      - if @site.domain_name.present?
+        = link_to "http://#{@site.domain_name}", target: "_blank" do
+          %span.glyphicon.glyphicon-new-window 
     .col-sm-8
       = f.text_field :hostname, label: 'Host Name', label_col: "col-sm-4", control_col: "col-sm-8", placeholder: 'Hostname is created on the first deployment', disabled: ''
+    .col-sm-4
+      - if @site.hostname.present?
+        = link_to "http://#{@site.domain_name}", target: "_blank" do
+          %span.glyphicon.glyphicon-new-window 
   = f.submit 'Save Settings', class: 'btn btn-primary'
   %i.glyphicon.glyphicon-ok.hidden
   %i.glyphicon.glyphicon-exclamation-sign.hidden

data/lib/statixite/cloud_sync.rb

@@ -11,14 +11,31 @@ module Statixite
         @cloud_directory = @fog_client.directories.create :key => @container_name, :public => true
         case Statixite.config.fog_credentials[:provider]
         when 'AWS'
-          @fog_client.put_bucket_website(@container_name, "index.html", :key => "404.html")
+          @fog_client.put_bucket_website(@container_name, IndexDocument: "index.html", ErrorDocument: "404.html")
+          @fog_client.put_bucket_policy(@container_name,
+            {
+              "Statement" => [
+                { "Sid"       => "PublicReadGetObject",
+                  "Effect"    => "Allow",
+                  "Principal" => "*",
+                  "Action"    => "s3:GetObject",
+                  "Resource"  => "arn:aws:s3:::#{@container_name}/*"
+                }
+              ]
+            }
+          )
         when 'Rackspace'
           @cloud_directory.metadata[:web_index] = "index.html"
           @cloud_directory.metadata[:web_error] = "error.html"
         end 
       end
       if @site.hostname.nil? && @cloud_directory.public_url.present?
-        @site.hostname = URI(@cloud_directory.public_url).host
+        case Statixite.config.fog_credentials[:provider]
+        when 'AWS'
+          @site.hostname = "#{@container_name}.s3-website-#{@fog_client.region}.amazonaws.com"
+        when 'Rackspace'
+          @site.hostname = URI(@cloud_directory.public_url).host
+        end
         @site.save
       end
     end

data/lib/statixite/version.rb

@@ -1,3 +1,3 @@
 module Statixite
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statixite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Richard LaFranchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails