helios 0.2.1 → 0.2.2

data/lib/helios/backend/passbook.rb

@@ -1,19 +1,25 @@
 require 'rack/passbook'
+
+require 'sinatra/base'
 require 'sinatra/param'
 
 class Helios::Backend::Passbook < Sinatra::Base
   helpers Sinatra::Param
 
-  def initialize(app, options = {})
+  def initialize(app, options = {}, &block)
     super(Rack::Passbook.new)
   end
 
+  before do
+    content_type :json
+  end
+
   get '/passes' do
     param :q, String
 
     passes = Rack::Passbook::Pass.dataset
     passes = passes.filter("tsv @@ to_tsquery('english', ?)", "#{params[:q]}:*") if params[:q] and not params[:q].empty?
-    
+
     if params[:page] or params[:per_page]
       param :page, Integer, default: 1, min: 1
       param :per_page, Integer, default: 100, in: (1..100)

data/lib/helios/backend/push-notification.rb

@@ -1,11 +1,23 @@
 require 'rack/push-notification'
+
+require 'sinatra/base'
 require 'sinatra/param'
 
+require 'houston'
+
 class Helios::Backend::PushNotification < Sinatra::Base
-  helpers Sinatra::Param  
+  helpers Sinatra::Param
+  attr_reader :apn_certificate, :apn_environment
 
-  def initialize(app, options = {})
+  def initialize(app, options = {}, &block)
     super(Rack::PushNotification.new)
+
+    @apn_certificate = options[:apn_certificate] || ENV['APN_CERTIFICATE']
+    @apn_environment = options[:apn_environment] || ENV['APN_ENVIRONMENT']
+  end
+
+  before do
+    content_type :json
   end
 
   get '/devices/?' do
@@ -79,16 +91,17 @@ class Helios::Backend::PushNotification < Sinatra::Base
 
   def client
     begin
-      return nil unless settings.apn_certificate and ::File.exist?(settings.apn_certificate)
-      
-      client = case settings.apn_environment.to_sym
-                when :development 
-                  Houston::Client.development
-                when :production
-                  Houston::Client.production
-                end
-      client.certificate = ::File.read(settings.apn_certificate)
-      
+      return nil unless apn_certificate and ::File.exist?(apn_certificate)
+
+      client = case apn_environment.to_sym
+               when :development
+                 Houston::Client.development
+               when :production
+                 Houston::Client.production
+               end
+
+      client.certificate = ::File.read(apn_certificate)
+
       return client
     rescue
       return nil

data/lib/helios/commands/console.rb

@@ -6,19 +6,13 @@ command :console do |c|
       require 'irb'
       require 'dotenv'
       require 'sequel'
-
-      @env = {}
-      @env.update Dotenv::Environment.new(".env")
-
-      Sequel.connect(@env['DATABASE_URL'])
-
-      require 'rack/core-data'
-      require 'rack/push-notification'
-      require 'rack/in-app-purchase'
-      require 'rack/passbook'
+      require 'helios'
 
       include Rack
 
+      Dotenv.load
+      Sequel.connect(ENV['DATABASE_URL'])
+
       ARGV.clear
       IRB.start
   end

data/lib/helios/commands/new.rb

@@ -31,7 +31,6 @@ command :new do |c|
 
     begin
       FileUtils.mkdir_p(path) and Dir.chdir(path)
-      log "create", ""
 
       Dir.glob(File.join(File.dirname(__FILE__), "../templates/") + "*.erb", File::FNM_DOTMATCH).each do |template|
         file = File.basename(template, ".erb")

data/lib/helios/commands/server.rb

@@ -28,6 +28,10 @@ def validate_database_settings!
 
   say_error "DATABASE_URL environment variable not set in .env or in Rails config/database.yml" and abort if ENV['DATABASE_URL'].nil?
 
+  uri = URI(ENV['DATABASE_URL'])
+
+  say_error "DATABASE_URL environment variable not set to PostgreSQL database" and abort unless ["postgres", "postgresql"].include?(uri.scheme)
+
   begin
     db = Sequel.connect(ENV['DATABASE_URL'])
     db.test_connection
@@ -36,7 +40,6 @@ def validate_database_settings!
     case error.message
     when /database "(.+)" does not exist/
       if agree "Would you like to create this database now? (y/n)"
-        uri = URI(db.uri)
         host, database = uri.host, uri.path.delete("/")
 
         log 'createdb', database

data/lib/helios/frontend.rb

@@ -26,6 +26,9 @@ module Helios
 
       js :application, '/javascripts/application.js', [
         'javascripts/vendor/jquery.js',
+        'javascripts/vendor/jquery/jquery.ui.widget.js',
+        'javascripts/vendor/jquery/jquery.fileupload.js',
+        'javascripts/vendor/jquery/jquery.fileupload-ui.js',
         'javascripts/vendor/underscore.js',
         'javascripts/vendor/backbone.js',
         'javascripts/vendor/backbone.paginator.js',
@@ -35,8 +38,8 @@ module Helios
         'javascripts/vendor/foundation.js',
         'javascripts/vendor/foundation/foundation.dropdown.js',
         'javascripts/vendor/foundation/foundation.reveal.js',
-        'javascripts/vendor/foundation/*',
         'javascripts/vendor/date.js',
+        'javascripts/vendor/linkheaders.js',
         'javascripts/helios.js',
         'javascripts/helios/models.js',
         'javascripts/helios/collections.js',
@@ -50,25 +53,14 @@ module Helios
       ]
     end
 
-    set :views, settings.root + '/templates'
-    serve_jst '/javascripts/helios/templates.js'
+    serve_jst '/javascripts/helios/templates.js', root: settings.root + '/templates'
 
     get '' do
       redirect request.fullpath + "/"
     end
 
     get '/' do
-      haml :'../views/index'
-    end
-  end
-end
-
-module Sinatra
-  module AssetPack
-    class Package
-      def production_path
-        add_cache_buster(@path, *files).gsub(/^\//, "")
-      end
+      haml :index
     end
   end
 end

data/lib/helios/frontend/images/helios.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="200px" height="100px" viewBox="0 0 200 100" enable-background="new 0 0 200 100" xml:space="preserve">
+<g>
+	<path fill="#BFBC3D" d="M11.75,44.979c1.637-2.497,5.251-5.166,11.019-5.166c11.708,0,14.463,7.49,14.463,14.982v21.518
+		c0,2.587-2.065,4.477-4.647,4.477c-2.757,0-4.649-1.89-4.649-4.477V56.515c0-4.908-1.98-8.265-7.575-8.265
+		c-6.458,0-8.61,3.788-8.61,8.869v19.193c0,2.587-1.98,4.477-4.647,4.477c-2.669,0-4.65-1.89-4.65-4.477V23.457
+		c0-2.582,2.065-4.649,4.65-4.649c2.582,0,4.647,2.068,4.647,4.649V44.979z"/>
+	<path fill="#BFBC3D" d="M62.28,39.813c14.548,0,17.216,11.192,17.216,17.13c0,3.186,0,6.889-5.251,6.889H52.98
+		c0,6.196,4.392,9.041,10.074,9.041c3.788,0,6.455-1.296,8.522-2.67c0.945-0.604,1.635-0.949,2.755-0.949
+		c2.239,0,4.046,1.808,4.046,4.048c0,1.379-0.689,2.494-1.464,3.186c-1.464,1.379-6.026,4.735-13.859,4.735
+		c-11.967,0-19.372-6.459-19.372-20.835C43.683,47.217,50.571,39.813,62.28,39.813z M53.238,56.086h17.048
+		c0-4.221-2.412-8.352-8.006-8.352C57.286,47.734,53.669,50.574,53.238,56.086z"/>
+	<path fill="#BFBC3D" d="M95.676,23.457v47.175c0,1.033,1.033,1.55,1.637,1.55c2.409,0,4.304,1.895,4.304,4.306
+		c0,2.412-1.895,4.302-4.304,4.302c-6.715,0-10.934-3.785-10.934-11.019V23.457c0-2.582,2.066-4.649,4.647-4.649
+		C93.611,18.807,95.676,20.875,95.676,23.457z"/>
+	<path fill="#BFBC3D" d="M106.433,30.257c0-3.96,1.982-5.683,5.51-5.683c3.615,0,5.598,1.722,5.598,5.683
+		c0,3.356-1.982,5.424-5.598,5.424C108.415,35.682,106.433,33.614,106.433,30.257z M116.595,76.142c0,2.582-2.07,4.647-4.652,4.647
+		s-4.647-2.065-4.647-4.647V44.979c0-2.584,2.065-4.65,4.647-4.65s4.652,2.065,4.652,4.65V76.142z"/>
+	<path fill="#BFBC3D" d="M142.248,81.223c-11.623,0-18.857-6.63-18.857-20.664c0-14.116,7.234-20.746,18.857-20.746
+		c11.618,0,18.853,6.63,18.853,20.746C161.101,74.593,153.866,81.223,142.248,81.223z M142.248,47.734
+		c-6.201,0-9.471,4.304-9.471,12.825c0,8.437,3.27,12.743,9.471,12.743c6.196,0,9.47-4.307,9.47-12.743
+		C151.718,52.038,148.444,47.734,142.248,47.734z"/>
+	<path fill="#BFBC3D" d="M176.675,51.176c0,6.372,21.177,3.444,21.177,17.649c0,8.091-6.884,12.223-15.754,12.223
+		c-7.4,0-13.085-3.356-15.233-6.026c-0.692-0.857-1.038-1.632-1.038-2.665c0-2.24,1.896-4.136,4.136-4.136
+		c0.857,0,1.72,0.259,2.67,1.033c2.323,1.895,5.164,3.531,9.466,3.531c3.877,0,6.371-1.032,6.371-3.443
+		c0-6.977-21.089-3.357-21.089-17.993c0-7.748,6.455-11.536,14.376-11.536c6.109,0,11.536,2.324,13.947,5.336
+		c0.517,0.689,0.857,1.293,0.857,2.584c0,2.238-1.891,4.131-4.131,4.131c-1.203,0-1.979-0.517-2.928-1.206
+		c-1.896-1.376-4.219-2.755-7.746-2.755C178.57,47.904,176.675,49.025,176.675,51.176z"/>
+</g>
+</svg>

data/lib/helios/frontend/javascripts/helios.coffee

@@ -8,6 +8,7 @@ window.Helios = {
 
   initialize: ->
     window.app = new Helios.Routers.Root
+
     for entity in Helios.entities.models
       do (entity) ->
         name = entity.get('name').toLowerCase()
@@ -16,7 +17,7 @@ window.Helios = {
         window.app.route entity.url(), name
 
     window.app.views.entities = new Helios.Views.Entities({collection: Helios.entities})
-    window.app.views.entities.render()
+    window.app.views.entities.render() if Helios.services['data']
 
     Backbone.history.start({
       root: window.location.pathname,
@@ -26,11 +27,46 @@ window.Helios = {
 }
 
 $ ->
+  $.fn.serializeMultipart = ->
+    obj = $(this)
+
+    formData = new FormData()
+    $.each $(obj).find("input[type='file']"), (i, tag) ->
+      $.each $(tag)[0].files, (j, file) ->
+        formData.append tag.name, file
+
+    params = $(obj).serializeArray()
+    $.each params, (i, val) ->
+      formData.append val.name, val.value
+
+    formData
+
   $(document).foundation()
   $('body').delegate 'a[href^=#]', 'click', (event) ->
     event.preventDefault()
     href = $(this).attr('href')
     window.app.navigate(href, {trigger: true, replace: true})
 
-  Helios.entities = new Helios.Collections.Entities
-  Helios.entities.fetch(type: 'OPTIONS', success: Helios.initialize, error: Helios.initialize)
+  Helios.services = {}
+  $.ajax(type: 'OPTIONS', url: "/", success: (data, status, xhr) ->
+    header = xhr.getResponseHeader("Link")
+    $.linkheaders(header).each (idx, link) ->
+      href = link.attr('href')
+      rel = link.rels()[0]
+
+      switch rel
+        when "Helios::Backend::Data"
+          Helios.services['data'] = href
+        when "Helios::Backend::InAppPurchase"
+          Helios.services['in-app-purchase'] = href
+        when "Helios::Backend::Newsstand"
+          Helios.services['newsstand'] = href
+        when "Helios::Backend::PushNotification"
+          Helios.services['push-notification'] = href
+        when "Helios::Backend::Passbook"
+          Helios.services['passbook'] = href
+
+    Helios.entities = new Helios.Collections.Entities
+    Helios.entities.fetch(type: 'OPTIONS', url: (Helios.services['data'] || "") + '/resources', success: Helios.initialize, error: Helios.initialize)
+  )
+

data/lib/helios/frontend/javascripts/helios/collections.coffee

@@ -70,7 +70,7 @@ class Helios.Collections.Devices extends Helios.Collection
 
 class Helios.Collections.Receipts extends Helios.Collection
   model: Helios.Models.Receipt
-  url: '/receipts'
+
   fields: ['transaction_id', 'product_id', 'purchase_date', 'original_transaction_id', 'original_purchase_date', 'app_item_id', 'version_external_identifier', 'bid', 'bvrs', 'ip_address']
 
   paginator_core:
@@ -78,7 +78,6 @@ class Helios.Collections.Receipts extends Helios.Collection
     dataType: 'json'
     url: '/receipts?'
 
-
 class Helios.Collections.Passes extends Helios.Collection
   model: Helios.Models.Pass
   url: '/passes'
@@ -89,3 +88,12 @@ class Helios.Collections.Passes extends Helios.Collection
     dataType: 'json'
     url: '/passes?'
 
+class Helios.Collections.Issues extends Helios.Collection
+  model: Helios.Models.Issue
+  url: '/issues'
+  fields: ['name', 'title', 'summary', 'published_at', 'expires_at']
+
+  paginator_core:
+    type: 'GET'
+    dataType: 'json'
+    url: '/issues?'

data/lib/helios/frontend/javascripts/helios/models.coffee

@@ -13,8 +13,11 @@ class Helios.Models.Resource extends Backbone.Model
 
 class Helios.Models.Device extends Backbone.Model
   idAttribute: "token"
-  
+
 class Helios.Models.Receipt extends Backbone.Model
   idAttribute: "transaction_id"
 
 class Helios.Models.Pass extends Backbone.Model
+
+class Helios.Models.Issue extends Backbone.Model
+  idAttribute: "name"

data/lib/helios/frontend/javascripts/helios/router.coffee

@@ -4,6 +4,10 @@ class Helios.Routers.Root extends Backbone.Router
 
   initialize: (options) ->
     @views = {}
+
+    @views.navigation = new Helios.Views.Navigation
+    @views.navigation.render()
+
     super
 
   routes:
@@ -12,6 +16,7 @@ class Helios.Routers.Root extends Backbone.Router
     'push-notification':  'push_notification'
     'in-app-purchase':    'in_app_purchase'
     'passbook':           'passbook'
+    'newsstand':          'newsstand'
 
   index: ->
     Helios.entities.fetch(type: 'OPTIONS')
@@ -22,17 +27,24 @@ class Helios.Routers.Root extends Backbone.Router
 
   push_notification: ->
     @devices ?= new Helios.Collections.Devices
+    @devices.paginator_core.url = Helios.services['push-notification'] + '/devices'
     @views.devices ?= new Helios.Views.Devices(collection: @devices)
     @views.devices.render()
 
   in_app_purchase: ->
     @receipts ?= new Helios.Collections.Receipts
+    @receipts.paginator_core.url = Helios.services['in-app-purchase'] + '/receipts'
     @views.receipts ?= new Helios.Views.Receipts(collection: @receipts)
     @views.receipts.render()
 
   passbook: ->
     @passes ?= new Helios.Collections.Passes
+    @passes.paginator_core.url = Helios.services['passbook'] + '/passes'
     @views.passes ?= new Helios.Views.Passes(collection: @passes)
     @views.passes.render()
 
-
+  newsstand: ->
+    @issues ?= new Helios.Collections.Issues
+    @issues.paginator_core.url = Helios.services['newsstand'] + '/issues'
+    @views.issues ?= new Helios.Views.Issues(collection: @issues)
+    @views.issues.render()

data/lib/helios/frontend/javascripts/helios/views.coffee

@@ -1,5 +1,12 @@
+class Helios.Views.Navigation extends Backbone.View
+  template: JST['navigation']
+  el: "[role='navigation']"
+
+  render: =>
+    @$el.html(@template())
+
 class Helios.Views.Entities extends Backbone.View
-  template: JST['entities']
+  template: JST['data/entities']
   el: "[role='main']"
 
   events:
@@ -36,7 +43,7 @@ class Helios.Views.Entity extends Backbone.View
     @
 
 class Helios.Views.Devices extends Backbone.View
-  template: JST['devices']
+  template: JST['push-notification/devices']
   el: "[role='main']"
 
   events:
@@ -53,8 +60,8 @@ class Helios.Views.Devices extends Backbone.View
   render: =>
     @$el.html(@template())
 
-    @composeView ?= new Helios.Views.Compose()
-    @composeView.render()
+    # @composeView ?= new Helios.Views.Compose()
+    # @composeView.render()
     @$el.find("#datagrid").html(@datagrid.el)
 
     @
@@ -65,7 +72,7 @@ class Helios.Views.Devices extends Backbone.View
     @collection.fetch()
 
 class Helios.Views.Compose extends Backbone.View
-  template: JST['compose']
+  template: JST['push-notification/compose']
   el: "#compose-modal"
 
   events:
@@ -108,7 +115,8 @@ class Helios.Views.Compose extends Backbone.View
     if $("input[name='recipients']:checked").val() == "specified"
       tokens = [$form.find("#tokens").val()]
 
-    $.ajax("/message"
+    $.ajax(
+      url:"/message"
       type: "POST"
       dataType: "json"
       data: {
@@ -181,7 +189,7 @@ class Helios.Views.Compose extends Backbone.View
     $time.find(".date").text(Date.now().toString("dddd, MMMM d"))
 
 class Helios.Views.Receipts extends Backbone.View
-  template: JST['receipts']
+  template: JST['in-app-purchase/receipts']
   el: "[role='main']"
 
   events:
@@ -207,7 +215,7 @@ class Helios.Views.Receipts extends Backbone.View
     @collection.fetch()
 
 class Helios.Views.Passes extends Backbone.View
-  template: JST['passes']
+  template: JST['passbook/passes']
   el: "[role='main']"
 
   events:
@@ -231,3 +239,69 @@ class Helios.Views.Passes extends Backbone.View
     e.preventDefault()
     @collection.query = $(e.target).val()
     @collection.fetch()
+
+class Helios.Views.Issues extends Backbone.View
+  template: JST['newsstand/issues']
+  el: "[role='main']"
+
+  events:
+    'keyup form.filter input': 'filter'
+
+  initialize: ->
+    @datagrid = new Backbone.Datagrid({
+        collection: @collection,
+        columns: @collection.fields,
+        paginated: true,
+        perPage: 20
+      })
+
+    $.ajax(
+      url: Helios.services['newsstand'] + "/issues/new",
+      type: "HEAD",
+      error: ->
+        $(".auxiliary button").prop('disabled', true)
+    )
+
+  render: =>
+    @$el.html(@template())
+    @$el.find("#datagrid").html(@datagrid.el)
+
+    @newView ?= new Helios.Views.NewIssue()
+    @newView.render()
+
+    @
+
+  filter: (e) ->
+    e.preventDefault()
+    @collection.query = $(e.target).val()
+    @collection.fetch()
+
+class Helios.Views.NewIssue extends Backbone.View
+  template: JST['newsstand/new']
+  el: "#new-issue-modal"
+
+  events:
+    'submit form': 'submit'
+    'click button#create': 'submit'
+
+  render: ->
+    @$el.html(@template())
+
+    @
+
+  submit: ->
+    $form = @$el.find("form#new")
+    console.log($form.find("input[type='file']"))
+    $.ajax(
+      url: $form.attr("action")
+      type: "POST"
+      dataType: "json"
+      data: $form.serializeMultipart()
+      cache: false
+      contentType: false
+      processData: false
+      success: (data) ->
+        console.log("Success", data)
+      error: (data) ->
+        console.log("Failure", data)
+    )