helios 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8e7e4600d587e9ffb3c1c96a93e371c9000126
-  data.tar.gz: 6062579b3e86cdf248881d5785ac9679c240285f
+  metadata.gz: 402e29639eacaa1ba54ba2f4eccefb1ac228be91
+  data.tar.gz: c2f8542dd3218c7a2b97c75aeea6a0cec5c57f76
 SHA512:
-  metadata.gz: 493b0388cfaa239908e63bfd07b8ec900c89ecd463f59382f7e83a93cd17f78bc970cd204f0beee710649a17da0fc986bf2491997ba1dc1ae7b1ad52a558ebad
-  data.tar.gz: debfe1d63f7497d469afc5ae59cc8a4ad9ec9eea26c150c4f1bc31ad410c2a10a11cbb19d3032e26b268c46dc181c2d53f628d2f96645b7662d166c811746a62
+  metadata.gz: 4bfd61221daf7968ccba1a273930dfc0787610ce175e2d2cc0fab8e30fa7828b27c30810d8acf0597e9f5d09239b9ca6d974ad46c3017eb76b758bc214bae877
+  data.tar.gz: 2f8bb05d75f2bef9f6b4fb1f308aa7741bba846a6292aeb6be94b2c58e60d9e1199d919dc8afc838d68e179af1ad39795d60ea370c3daf3bd09376e68750a8d5

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    helios (0.2.0)
+    helios (0.2.1)
       coffee-script (~> 2.2)
       commander (~> 4.1)
       compass (~> 0.12)
-      foreman (~> 0.60)
-      haml (~> 3.1)
+      foreman (~> 0.63)
+      haml (>= 3.1)
       json (~> 1.7)
       rack-contrib (~> 1.1)
       rack-core-data (~> 0.3)
@@ -15,12 +15,12 @@ PATH
       rack-push-notification (~> 0.4)
       rails-database-url (~> 1.0)
       sinatra (~> 1.3)
-      sinatra-assetpack (~> 0.1)
+      sinatra-assetpack (~> 0.1.7)
       sinatra-backbone (~> 0.1.0.rc2)
       sinatra-contrib (~> 1.3)
       sinatra-param (~> 0.1)
       sinatra-support (~> 1.2)
-      zurb-foundation (~> 4.0)
+      zurb-foundation (= 4.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -28,7 +28,7 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    backports (3.1.1)
+    backports (3.3.0)
     chunky_png (1.2.8)
     coffee-script (2.2.0)
       coffee-script-source
@@ -40,16 +40,18 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.4)
+    dotenv (0.7.0)
     eventmachine (1.0.3)
-    excon (0.17.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    foreman (0.62.0)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
       thor (>= 0.13.6)
     fssm (0.2.10)
-    haml (3.1.8)
-    highline (1.6.16)
+    haml (4.0.2)
+      tilt
+    highline (1.6.18)
     houston (0.1.1)
       commander (~> 4.1.2)
       json (~> 1.7.3)
@@ -98,40 +100,39 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    sass (3.2.7)
-    sequel (3.45.0)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+    rspec-mocks (2.13.1)
+    sass (3.2.8)
+    sequel (3.46.0)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sinatra-assetpack (0.1.7)
       jsmin
       rack-test
       sinatra
       tilt (>= 1.3.0)
-    sinatra-backbone (0.1.0.rc2)
+    sinatra-backbone (0.1.1)
       sinatra
-    sinatra-contrib (1.3.2)
+    sinatra-contrib (1.4.0)
       backports (>= 2.0)
       eventmachine
       rack-protection
       rack-test
-      sinatra (~> 1.3.0)
+      sinatra (~> 1.4.2)
       tilt (~> 1.3)
-    sinatra-param (0.1.2)
+    sinatra-param (0.1.3)
       sinatra (~> 1.3)
     sinatra-support (1.2.2)
       sinatra (>= 1.0)
     terminal-table (1.4.5)
     thor (0.18.1)
-    tilt (1.3.6)
-    venice (0.0.1)
-      commander (~> 4.1.2)
-      excon (~> 0.17.0)
-      json (~> 1.7.3)
-      terminal-table (~> 1.4.5)
-    zurb-foundation (4.0.9)
+    tilt (1.3.7)
+    venice (0.1.0)
+      commander (~> 4.1)
+      json
+      terminal-table (~> 1.4)
+    zurb-foundation (4.1.2)
       sass (>= 3.2.0)
 
 PLATFORMS

data/README.md

@@ -17,21 +17,37 @@ Helios also comes with a Web UI. Browse and search through all of your database
 - Ruby 1.9
 - PostgreSQL 9.1 _([Postgres.app](http://postgresapp.com) is the easiest way to get a Postgres server running on your Mac)_
 
-## Getting Started
+## Getting Started on OS X
 
-1. Install Helios at the command prompt:
+1. Verify Ruby Installation:
 
-    $ gem install helios
+    `$ ruby -v`
 
-2. Create a new Helios application:
+> If you do not see `ruby 1.9.x` printed, we suggest installing [RVM](http://rvm.io) to manage Ruby versions.
 
-    $ helios new myapp
+2. Install Helios at the command prompt:
 
-3. Change directory to `myapp` and start the web server:
+    `$ gem install helios`
 
-    $ cd myapp; helios server
+3. Create a new Helios application:
 
-4. Go to http://localhost:5000/admin and you’ll see your app's Web UI
+    `$ helios new myapp`
+
+3. Create a Postgres database at the command prompt:
+
+    `$ createdb -h localhost myapp`
+
+> Database credentials are read from the `.env` file generated by Helios, as the variable `DATABASE_URL`. By default, this will point to a database with the name of the generated app.
+
+4. Change directory to `myapp`
+
+    `$ cd myapp`
+
+5. Start the web server:
+
+    `$ helios server`
+
+6. Go to [http://localhost:5000/admin](http://localhost:5000/admin) and you’ll see your app's Web UI
 
 Read on for instructions on the following:
 
@@ -59,11 +75,11 @@ require 'bundler'
 Bundler.require
 
 run Helios::Application.new do
-      service :data, model: 'path/to/DataModel.xcdatamodel'
-      service :push_notification
-      service :in_app_purchase
-      service :passbook
-    end
+  service :data, model: 'path/to/DataModel.xcdatamodel'
+  service :push_notification
+  service :in_app_purchase
+  service :passbook
+end
 ```
 
 ### Rails
@@ -126,7 +142,7 @@ Each entity in the specified data model will have a `Sequel::Model` subclass cre
   </tr>
   <tr>
     <td><tt>DELETE /:resources/:id</tt></td>
-    <td>Delege the specified resource instance</td>
+    <td>Delete the specified resource instance</td>
   </tr>
 </table>
 
@@ -269,7 +285,7 @@ Once you've installed the [Heroku Toolbelt](https://toolbelt.heroku.com), and ha
     $ heroku create
     $ git push heroku master
 
-## Integrating with iOS Application
+## Integrating with an iOS Application
 
 ### Core Data Synchronization
 
@@ -279,6 +295,8 @@ See ["Building an iOS App with AFIncrementalStore and the Core Data Buildpack"](
 
 ### Push Notification Registration
 
+With [Orbiter](https://github.com/mattt/Orbiter) you can integrate Push Notifications into your app easily.
+
 ```objective-c
 - (void)application:(UIApplication *)application
 didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
@@ -293,6 +311,18 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 }
 ```
 
+## Coming Attractions
+
+There's still a lot to do to make Helios even better. Here are some ideas that are at the top of the list:
+
+- Test coverage
+- More documentation
+- More example projects
+- Better RubyMotion integration
+- Support for multiple schema definitions (not just Core Data)
+- Send push notifications from the UI
+- Support for additional platforms (Android, WP7)
+
 ---
 
 ## Contact

data/Rakefile

@@ -7,5 +7,4 @@ task :build => "#{gemspec.full_name}.gem"
 
 file "#{gemspec.full_name}.gem" => gemspec.files + ["helios.gemspec"] do
   system "gem build helios.gemspec"
-  system "gem install helios-#{Helios::VERSION}.gem"
 end

data/helios.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = "Helios is an open-source framework that provides essential backend services for iOS apps, from data synchronization and user accounts to push notifications, in-app purchases, and passbook integration. It allows developers to get a client-server app up-and-running in just a few minutes, and seamlessly incorporate functionality as necessary."
 
   s.add_dependency "commander", "~> 4.1"
-  s.add_dependency "foreman", "~> 0.60"
+  s.add_dependency "foreman", "~> 0.63"
   s.add_dependency "rack-contrib", "~> 1.1"
   s.add_dependency "rack-core-data", "~> 0.3"
   s.add_dependency "rack-push-notification", "~> 0.4"
@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
   s.add_dependency "coffee-script", "~> 2.2"
   s.add_dependency "sinatra", "~> 1.3"
   s.add_dependency "sinatra-contrib", "~> 1.3"
-  s.add_dependency "sinatra-assetpack", "~> 0.1"
+  s.add_dependency "sinatra-assetpack", "~> 0.1.7"
   s.add_dependency "sinatra-backbone", "~> 0.1.0.rc2"
   s.add_dependency "sinatra-param", "~> 0.1"
   s.add_dependency "sinatra-support", "~> 1.2"
-  s.add_dependency "haml", "~> 3.1"
+  s.add_dependency "haml", ">= 3.1"
   s.add_dependency "compass", "~> 0.12"
-  s.add_dependency "zurb-foundation", "~> 4.0"
+  s.add_dependency "zurb-foundation", "4.1.2"
   s.add_dependency "rails-database-url", "~> 1.0"
 
   s.add_development_dependency "rake",  ">= 0"

data/lib/helios.rb

@@ -1,10 +1,10 @@
 require 'rack'
 
 module Helios
-  class Helios::Application
+  class Application
     def initialize(app = nil, options = {}, &block)
       map = {}
-      map['/'] = Helios::Backend.new(&block)
+      map['/'] = Rack::Cascade.new([app, Helios::Backend.new(&block)].compact)
       map['/admin'] = Helios::Frontend.new if options.fetch(:frontend, true)
 
       @app = Rack::URLMap.new(map)

data/lib/helios/backend/data.rb

@@ -14,8 +14,6 @@ class Helios::Backend::Data < Sinatra::Base
     content_type :json
   end
 
-  helpers Sinatra::Param
-
   options '/' do
     pass unless self.class < Helios::Administerable
 

data/lib/helios/commands/console.rb

@@ -4,13 +4,11 @@ command :console do |c|
 
   c.action do |args, options|
       require 'irb'
-      require 'foreman/env'
+      require 'dotenv'
       require 'sequel'
 
       @env = {}
-      Foreman::Env.new(".env").entries do |name, value|
-        @env[name] = value
-      end
+      @env.update Dotenv::Environment.new(".env")
 
       Sequel.connect(@env['DATABASE_URL'])
 

data/lib/helios/commands/server.rb

@@ -1,8 +1,14 @@
+require 'dotenv'
+require 'sequel'
+
 command :server do |c|
   c.syntax = 'helios server'
   c.summary = 'Start running Helios locally'
+  c.option '-w', "--[no-]warn", "Warn about possible database issues"
 
   c.action do |args, options|
+    validate_database_settings! unless options.warn == false
+
     begin
       exec 'foreman start'
     rescue => exception
@@ -14,3 +20,30 @@ end
 alias_command :s, :server
 alias_command :start, :server
 alias_command :launch, :server
+
+private
+
+def validate_database_settings!
+  Dotenv.load
+
+  say_error "DATABASE_URL environment variable not set in .env or in Rails config/database.yml" and abort if ENV['DATABASE_URL'].nil?
+
+  begin
+    db = Sequel.connect(ENV['DATABASE_URL'])
+    db.test_connection
+  rescue Sequel::DatabaseConnectionError => error
+    say_warning %{Error connecting to database: "#{error.message.strip}"}
+    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
+        system "createdb -h #{host} #{database}"
+      end
+    else
+      abort unless agree "Continue starting Helios? (y/n)"
+    end
+  end
+end

data/lib/helios/version.rb

@@ -1,3 +1,3 @@
 module Helios
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helios
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.63'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.63'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: sinatra-backbone
   requirement: !ruby/object:Gem::Requirement
@@ -224,14 +224,14 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -252,16 +252,16 @@ dependencies:
   name: zurb-foundation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: rails-database-url
   requirement: !ruby/object:Gem::Requirement