contentful_bootstrap 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9506edbc16f70f64a055a68070cc45ab223f659
-  data.tar.gz: c6264e50faf9279fd7ab8f6b711ef28078429db8
+  metadata.gz: 53b22cc778c5ea2cc284ae20b28fdeddeb23ab41
+  data.tar.gz: b2da6f2928e023c29e03832b534e210ecdb42cdc
 SHA512:
-  metadata.gz: 1f6699a6d573ef6861d375532da40236d2fcc64476108482a27b53a3621788fee0c0b1af917255f8801fb2d133d7c90e550f05caa52b1b5ed1651d6927ee5aec
-  data.tar.gz: b28410bf29c7bf06b8b593f236736431e40d50c2d772dc374ac205affd780aac60326b0a5326c9f31b5b4f1a0290e272c46f35f4e492d6bf02ecce379c199697
+  metadata.gz: 1d9632fac3308458ddce48349c96c193de969a0ae5a77cee06811db6119088100d9405051f8d9320cc3e49abd1746bba4ab7993d0bb5440141f9fe831d096820
+  data.tar.gz: 7e3f14690da03181e200651d4ebecf95cfd436a9c0580f722ff9b59909826e0b20f9c2726b46fe11975287434f53af22e7977e4f5440c7193c906f301c267112

data/.gitignore

@@ -27,11 +27,11 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-.contentful_bootstrap
+.contentful_token

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+## Unreleased
+
+## v0.0.4
+### Added
+* Added support for users with multiple Organizations
+* Added `gallery` template
+
+### Changed
+* Removed `deklarativna` dependency
+* Removed `sinatra` dependency
+* Removed unnecessary `Gemfile.lock` file
+
+## v0.0.3
+### Added
+* Added `contentful_bootstrap` command
+* Added `blog` template
+
+### Fixed
+* Fixed Dependencies
+
+## v0.0.2 [YANKED]
+
+## v0.0.1 [YANKED]

data/Gemfile

@@ -1,7 +1,5 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem "sinatra"
 gem "launchy"
 gem "contentful-management"
-gem "deklarativna"

data/README.md

@@ -8,6 +8,10 @@ mobile apps and connected devices. It allows you to create, edit  manage co
 and publish it anywhere via powerful API. Contentful offers tools for managing editorial
 teams and enabling cooperation between organizations.
 
+## What does `contentful_bootstrap` do?
+The aim of `contentful_bootstrap` is to have developers setting up their Contentful environment
+in a single command
+
 ## How to Use
 
 ### Installation
@@ -28,6 +32,16 @@ Then you can create other spaces by doing:
 $ contentful_bootstrap create_space <space_name> [--template template_name]
 ```
 
+### Available templates
+
+The available templates for your spaces are:
+
+```
+blog
+gallery
+catalogue
+```
+
 This will get you started with Contentful by setting up a Space with some Demo Data to get you
 started as soon as possible with development using our API.
 

data/contentful_bootstrap.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "launchy"
   spec.add_runtime_dependency "contentful-management"
-  spec.add_runtime_dependency "deklarativna"
 end

data/lib/contentful_bootstrap.rb

@@ -1,2 +1,5 @@
 require "contentful_bootstrap/version"
 require "contentful_bootstrap/server"
+require "contentful_bootstrap/commands"
+require "contentful_bootstrap/templates"
+require "contentful_bootstrap/token"

data/lib/contentful_bootstrap/commands.rb

@@ -1,4 +1,3 @@
-require "thread"
 require "net/http"
 require "contentful/management"
 require "contentful_bootstrap/token"
@@ -26,7 +25,15 @@ module ContentfulBootstrap
       management_client_init
 
       puts "Creating Space '#{space_name}'"
-      space = Contentful::Management::Space.create(name: space_name)
+      space = nil
+      begin
+        space = Contentful::Management::Space.create(name: space_name)
+      rescue Contentful::Management::NotFound
+        puts "Your account has multiple organizations"
+        print "Please insert the Organization ID you'd want to create the spaces for: "
+        organization_id = gets.chomp
+        space = Contentful::Management::Space.create(name: space_name, organization_id: organization_id)
+      end
       puts "Space '#{space_name}' created!"
 
       return if template_name.nil?
@@ -48,9 +55,11 @@ module ContentfulBootstrap
 
     def get_token
       silence_stderr do # Don't show any Sinatra related stuff
-        t = Thread.new { Server.run! }
+        server = Server.new
+
+        server.start
 
-        while !Server.running? # Wait for Server Init
+        while !server.running? # Wait for Server Init
           sleep(1)
         end
 
@@ -60,7 +69,7 @@ module ContentfulBootstrap
           sleep(1)
         end
 
-        Server.quit!
+        server.stop
       end
     end
 

data/lib/contentful_bootstrap/server.rb

@@ -1,63 +1,91 @@
-require "sinatra"
+require "thread"
+require "webrick"
 require "launchy"
-require "deklarativna"
-require "thin"
 require "contentful_bootstrap/constants"
 require "contentful_bootstrap/token"
 
 module ContentfulBootstrap
-  class OAuthEchoView < BaseTemplate
-    def _body
-      script(type: "text/javascript") {
-        <<-JS
-          (function() {
-            var access_token = window.location.hash.split('&')[0].split('=')[1];
-            window.location.replace('http://localhost:5123/save_token/' + access_token);
-          })();
-        JS
-      }
+  class OAuthEchoView
+    def render
+      <<-JS
+      <html><head></head><body>
+      <script type="text/javascript">
+        (function() {
+          var access_token = window.location.hash.split('&')[0].split('=')[1];
+          window.location.replace('http://localhost:5123/save_token?token=' + access_token);
+        })();
+      </script>
+      </body></html>
+      JS
     end
   end
 
-  class ThanksView < BaseTemplate
-    def _head
-      link(rel: "stylesheet", href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css")
-    end
-
-    def _body
-      div(class: "container") {
-        div(class: "jumbotron") {[
-          h1 { "Contentful Bootstrap" },
-          h4 { "Thanks! The OAuth Token has been generated" },
-          p { "The Space you specified will now start to create. You can close this window freely" }
-        ]}
-      }
+  class ThanksView
+    def render
+      <<-HTML
+      <html><head>
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
+      </head><body>
+        <div class="container">
+          <div class="jumbotron">
+            <h1>Contentful Bootstrap</h1>
+            <h4>Thanks! The OAuth Token has been generated</h4>
+            <p>The Space you specified will now start to create. You can close this window freely</p>
+          </div>
+        </div>
+      </body></html>
+      HTML
     end
   end
 
-  class Server < Sinatra::Base
-    configure do
-      set :port, 5123
-      set :logging, nil
-      set :quiet, true
-      Thin::Logging.silent = true # Silence Thin startup message
-    end
-
-    get '/' do
+  class IndexController < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET(request, response)
       client_id = ContentfulBootstrap::Constants::OAUTH_APP_ID
       redirect_uri = ContentfulBootstrap::Constants::OAUTH_CALLBACK_URL
       scope = "content_management_manage"
       Launchy.open("https://be.contentful.com/oauth/authorize?response_type=token&client_id=#{client_id}&redirect_uri=#{redirect_uri}&scope=#{scope}")
-      ""
+      response.status = 200
+      response.body = ""
+    end
+  end
+
+  class OAuthCallbackController < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET(request, response)
+      #get '/oauth_callback' do
+      response.status = 200
+      response.content_type = "text/html"
+      response.body = OAuthEchoView.new.render
+    end
+  end
+
+  class SaveTokenController < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET(request, response)
+      Token.write(request.query["token"])
+      response.status = 200
+      response.content_type = "text/html"
+      response.body = ThanksView.new.render
+    end
+  end
+
+  class Server
+    attr_reader :server
+    def initialize
+      @server = WEBrick::HTTPServer.new(:Port => 5123)
+      @server.mount "/", IndexController
+      @server.mount "/oauth_callback", OAuthCallbackController
+      @server.mount "/save_token", SaveTokenController
+    end
+
+    def start
+      Thread.new { @server.start }
     end
 
-    get '/oauth_callback' do
-      OAuthEchoView.new.render
+    def stop
+      @server.shutdown
     end
 
-    get '/save_token/:token' do
-      Token.write(params[:token])
-      ThanksView.new.render
+    def running?
+      @server.status != :Stop
     end
   end
 end

data/lib/contentful_bootstrap/templates/base.rb

@@ -10,6 +10,34 @@ module ContentfulBootstrap
       end
 
       def run
+        create_content_types
+        create_assets
+        create_entries
+      end
+
+      def content_types
+        []
+      end
+
+      def entries
+        {}
+      end
+
+      def assets
+        []
+      end
+
+      protected
+      def create_image(name, url)
+        image = Contentful::Management::File.new
+        image.properties[:contentType] = 'image/jpeg'
+        image.properties[:fileName] = "#{name}.jpg"
+        image.properties[:upload] = url
+        image
+      end
+
+      private
+      def create_content_types
         content_types.each do |ct|
           puts "Creating Content Type '#{ct[:name]}'"
 
@@ -24,7 +52,15 @@ module ContentfulBootstrap
             field.id = f[:id]
             field.name = f[:name]
             field.type = f[:type]
-            field.link_type = f[:link_type] if f.has_key?(:link_type)
+            field.link_type = f[:link_type] if is_link?(f)
+
+            if is_array?(f)
+              array_field = Contentful::Management::Field.new
+              array_field.type = f[:items][:type]
+              array_field.link_type = f[:items][:link_type]
+              field.items = array_field
+            end
+
             fields << field
           end
 
@@ -32,25 +68,48 @@ module ContentfulBootstrap
           content_type.save
           content_type.activate
         end
+      end
 
+      def is_link?(field)
+        field.has_key?(:link_type)
+      end
+
+      def is_array?(field)
+        field.has_key?(:items)
+      end
+
+      def create_assets
+        assets.each do |asset|
+          puts "Creating Asset '#{asset[:title]}'"
+          asset = space.assets.create(asset)
+          asset.process_file
+          asset.publish
+        end
+      end
+
+      def create_entries
         entries.each do |content_type_id, entry_list|
           content_type = space.content_types.find(content_type_id)
           entry_list.each_with_index do |e, index|
             puts "Creating Entry #{index} for #{content_type_id.capitalize}"
+
+            array_fields = []
+            e.each_pair do |field_name, value|
+              array_fields << field_name if value.is_a? Array
+            end
+
+            array_fields.each do |af|
+              e[af].map! do |f|
+                space.send(f.kind).find(f.id)
+              end
+            end
+
             entry = content_type.entries.create(e)
             entry.save
             entry.publish
           end
         end
       end
-
-      def content_types
-        raise "must implement"
-      end
-
-      def entries
-        raise "must implement"
-      end
     end
   end
 end

data/lib/contentful_bootstrap/templates/blog.rb

@@ -1,5 +1,5 @@
 require "contentful_bootstrap/templates/base"
-require "contentful_bootstrap/templates/entry_link"
+require "contentful_bootstrap/templates/links"
 
 module ContentfulBootstrap
   module Templates
@@ -60,12 +60,12 @@ module ContentfulBootstrap
             {
               title: "Inferno",
               content: "Inferno is the last book in Dan Brown's collection...",
-              author: EntryLink.new("dan_brown")
+              author: Links::Entry.new("dan_brown")
             },
             {
               title: "Alturas de Macchu Picchu",
               content: "Alturas de Macchu Picchu is one of Pablo Neruda's most famous poetry books...",
-              author: EntryLink.new("pablo_neruda")
+              author: Links::Entry.new("pablo_neruda")
             }
           ]
         }

data/lib/contentful_bootstrap/templates/gallery.rb

@@ -1,8 +1,116 @@
 require "contentful_bootstrap/templates/base"
+require "contentful_bootstrap/templates/links"
 
 module ContentfulBootstrap
   module Templates
     class Gallery < Base
+      def content_types
+        [
+          {
+            id: 'author',
+            name: "Author",
+            display_field: "name",
+            fields: [
+              {
+                name: "Name",
+                id: "name",
+                type: "Symbol"
+              }
+            ]
+          },
+          {
+            id: 'image',
+            name: 'Image',
+            display_field: 'title',
+            fields: [
+              {
+                id: 'title',
+                name: 'Title',
+                type: 'Symbol'
+              },
+              {
+                id: 'photo',
+                name: 'Photo',
+                type: 'Link',
+                link_type: 'Asset'
+              }
+            ]
+          },
+          {
+            id: 'gallery',
+            name: 'Gallery',
+            display_field: 'title',
+            fields: [
+              {
+                id: 'title',
+                name: 'Title',
+                type: 'Symbol'
+              },
+              {
+                id: 'author',
+                name: 'Author',
+                type: 'Link',
+                link_type: 'Entry'
+              },
+              {
+                id: 'images',
+                name: 'Images',
+                type: 'Array',
+                items: {
+                  type: 'Link',
+                  link_type: 'Entry'
+                }
+              }
+            ]
+          }
+        ]
+      end
+
+      def assets
+        [
+          {
+            id: 'pie',
+            title: 'Pie in the Sky',
+            file: create_image('pie', 'https://c2.staticflickr.com/6/5245/5335909339_d307a7cbcf_b.jpg')
+          },
+          {
+            id: 'flower',
+            title: 'The Flower',
+            file: create_image('flower', 'http://c2.staticflickr.com/4/3922/15045568809_b24591e318_b.jpg')
+          }
+        ]
+      end
+
+      def entries
+        {
+          'author' => [
+            {
+              id: 'dave',
+              name: 'Dave'
+            }
+          ],
+          'image' => [
+            {
+              id: 'pie_entry',
+              title: 'A Pie in the Sky',
+              photo: Links::Asset.new('pie')
+            },
+            {
+              id: 'flower_entry',
+              title: 'The Flower',
+              photo: Links::Asset.new('flower')
+            }
+          ],
+          'gallery' => [
+            {
+              id: 'gallery',
+              title: 'Photo Gallery',
+              author: Links::Entry.new('dave'),
+              images: [Links::Entry.new('pie_entry'), Links::Entry.new('flower_entry')]
+            }
+          ]
+        }
+      end
     end
   end
 end

data/lib/contentful_bootstrap/templates/links.rb

@@ -0,0 +1,2 @@
+require "contentful_bootstrap/templates/links/entry"
+require "contentful_bootstrap/templates/links/asset"

data/lib/contentful_bootstrap/templates/links/asset.rb

@@ -0,0 +1,13 @@
+require "contentful_bootstrap/templates/links/base"
+
+module ContentfulBootstrap
+  module Templates
+    module Links
+      class Asset < Base
+        def kind
+          :assets
+        end
+      end
+    end
+  end
+end

data/lib/contentful_bootstrap/templates/links/base.rb

@@ -0,0 +1,16 @@
+module ContentfulBootstrap
+  module Templates
+    module Links
+      class Base
+        attr_reader :id
+        def initialize(id)
+          @id = id
+        end
+
+        def kind
+          raise "must implement"
+        end
+      end
+    end
+  end
+end

data/lib/contentful_bootstrap/templates/links/entry.rb

@@ -0,0 +1,13 @@
+require "contentful_bootstrap/templates/links/base"
+
+module ContentfulBootstrap
+  module Templates
+    module Links
+      class Entry < Base
+        def kind
+          :entries
+        end
+      end
+    end
+  end
+end

data/lib/contentful_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module ContentfulBootstrap
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: deklarativna
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - david.litvakb@gmail.com
@@ -103,9 +75,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -120,8 +92,11 @@ files:
 - lib/contentful_bootstrap/templates/base.rb
 - lib/contentful_bootstrap/templates/blog.rb
 - lib/contentful_bootstrap/templates/catalogue.rb
-- lib/contentful_bootstrap/templates/entry_link.rb
 - lib/contentful_bootstrap/templates/gallery.rb
+- lib/contentful_bootstrap/templates/links.rb
+- lib/contentful_bootstrap/templates/links/asset.rb
+- lib/contentful_bootstrap/templates/links/base.rb
+- lib/contentful_bootstrap/templates/links/entry.rb
 - lib/contentful_bootstrap/token.rb
 - lib/contentful_bootstrap/version.rb
 homepage: https://www.contentful.com

data/Gemfile.lock

@@ -1,59 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.8)
-    coderay (1.1.0)
-    contentful-management (0.7.2)
-      http (~> 0.8)
-      multi_json (~> 1)
-    daemons (1.2.3)
-    deklarativna (0.0.10)
-      launchy
-      sinatra
-      thin
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    eventmachine (1.0.8)
-    http (0.9.8)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    http-form_data (1.0.1)
-    http_parser.rb (0.6.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    method_source (0.8.2)
-    multi_json (1.11.2)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    thin (1.6.4)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
-    tilt (2.0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  contentful-management
-  deklarativna
-  launchy
-  pry
-  sinatra

data/lib/contentful_bootstrap/templates/entry_link.rb

@@ -1,10 +0,0 @@
-module ContentfulBootstrap
-  module Templates
-    class EntryLink
-      attr_reader :id
-      def initialize(id)
-        @id = id
-      end
-    end
-  end
-end