towsta 2.0.10 → 2.1.0

data/Gemfile.lock

@@ -1,20 +1,12 @@
 PATH
   remote: .
   specs:
-    towsta (2.0.2)
+    towsta (2.0.10)
       active_support
       bresson
       cameraman
-      coffee-script
-      compass
       dalli
-      haml
-      i18n-router
       json
-      pony
-      sinatra
-      sinatra-content-for
-      therubyracer
 
 GEM
   remote: http://rubygems.org/
@@ -22,53 +14,13 @@ GEM
     active_support (3.0.0)
       activesupport (= 3.0.0)
     activesupport (3.0.0)
-    addressable (2.2.6)
     bresson (0.0.5)
       flickraw
     cameraman (0.0.2)
-    chunky_png (1.2.5)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.2.0)
-    compass (0.11.7)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    dalli (1.1.4)
+    dalli (1.1.5)
     diff-lcs (1.1.3)
-    execjs (1.3.0)
-      multi_json (~> 1.0)
     flickraw (0.9.5)
-    fssm (0.2.8.1)
-    haml (3.1.4)
-    heroku (2.20.0)
-      launchy (>= 0.3.2)
-      rest-client (~> 1.6.1)
-      rubyzip
-      term-ansicolor (~> 1.0.5)
-    i18n (0.6.0)
-    i18n-router (0.0.3)
-      sinatra-r18n
     json (1.6.5)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    libv8 (3.3.10.4)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    pony (1.4)
-      mail (> 2.0)
-    r18n-core (0.4.14)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -77,32 +29,11 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    rubyzip (0.9.6.1)
-    sass (3.1.15)
-    shotgun (0.9)
-      rack (>= 1.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-content-for (0.2)
-      sinatra
-    sinatra-r18n (0.4.14)
-      r18n-core (= 0.4.14)
-      sinatra (>= 1.3)
-    term-ansicolor (1.0.7)
-    therubyracer (0.9.9)
-      libv8 (~> 3.3.10)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
-  heroku
   rspec
-  shotgun
   towsta!

data/bin/towsta

@@ -1,102 +1,4 @@
 #!/usr/bin/env ruby
-require 'net/http'
-action = ARGV.first
-if action == 'new'
-  project = ARGV[1]
-  Dir.mkdir project
-  configru = "require './app'\n"
-  configru += "run Sinatra::Application"
-  File.open("#{project}/config.ru", 'w') {|f| f.write(configru) }
-  gemfile = "source :rubygems \n"
-  gemfile += "gem 'towsta'"
-  File.open("#{project}/Gemfile", 'w') {|f| f.write(gemfile) }
-  apprb = "#coding: utf-8 \n"
-  apprb += "require 'sinatra'\n"
-  apprb += "require 'towsta'\n\n"
-  apprb += "get '/' do\n"
-  apprb += "  sync_with_towsta\n"
-  apprb += "  haml :index\n"
-  apprb += "end\n"
-  File.open("#{project}/app.rb", 'w') {|f| f.write(apprb) }
-  towstarb = "Towsta.secret = '#{ARGV[2]}'\n"
-  towstarb += "#Towsta.author = 'default_author_email'\n"
-  towstarb += "#Towsta.global = {}"
-  File.open("#{project}/towsta.rb", 'w') {|f| f.write(towstarb) }
-  Dir.mkdir "#{project}/views"
-  layout = "!!!\n"
-  layout += "%html\n"
-  layout += "  %head\n"
-  layout += "    = partial :head\n"
-  layout += "  %body\n"
-  layout += "    #top\n"
-  layout += "      .wrapper\n"
-  layout += "    #middle\n"
-  layout += "      .wrapper\n"
-  layout += "        = yield\n"
-  layout += "    #bottom\n"
-  layout += "      .wrapper\n"
-  File.open("#{project}/views/layout.haml", 'w') {|f| f.write(layout)}
-  index = '%h1 Hello Towsta'
-  File.open("#{project}/views/index.haml", 'w') {|f| f.write(index)}
-  Dir.mkdir "#{project}/models"
-  Dir.mkdir "#{project}/controllers"
-  Dir.mkdir "#{project}/public"
-  Dir.mkdir "#{project}/views/stylesheets"
-  Dir.mkdir "#{project}/views/javascripts"
-  css = "@import compass/reset\n"
-  css += "@import compass/css3\n\n"
-  css += "$wrapper: 940px\n\n"
-  css += ".wrapper\n"
-  css += "  :width $wrapper\n"
-  css += "  :margin 0 auto\n"
-  css += "#top, #middle, #bottom\n"
-  css += "  :float left\n"
-  css += "  :width 100%"
-  File.open("#{project}/views/stylesheets/app.sass", 'w') {|f| f.write(css)}
-  js = '$ ->'
-  File.open("#{project}/views/javascripts/app.coffee", 'w') {|f| f.write(js)}
-  Dir.mkdir "#{project}/views/partials"
-  head = "%title #{project}\n"
-  head += "%meta{:'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'utf-8'}\n"
-  head += "%link{rel: 'stylesheet', type: 'text/css', href: '/stylesheets/app.css'}\n"
-  head += "%link{rel: 'shortcut icon', type: 'image/x-icon', href: '/images/favicon.png'}\n"
-  head += "%script{src: '/js/jquery.js'}\n"
-  head += "%script{src: '/js/app.js'}"
-  File.open("#{project}/views/partials/_head.haml", 'w') {|f| f.write(head)}
-  Dir.mkdir "#{project}/public/js"
-  Net::HTTP.start("code.jquery.com"){|http| @jquery = http.get('/jquery.min.js').body}
-  File.open("#{project}/public/js/jquery.js", 'w') {|f| f.write(@jquery)}
-  Dir.mkdir "#{project}/public/images"
-  Dir.mkdir "#{project}/locales"
-  git = '*.swp'
-  File.open("#{project}/.gitignore", 'w') {|f| f.write(git)}
-  puts "#{project} is ready to towst!"
-elsif action == 'server'
-  port = ARGV[1].nil? ? '6937' : ARGV[1]
-  system "shotgun -I config.ru -p #{port}"
-elsif action == 'console'
-  system 'irb -r ./app.rb'
-elsif action == 'configure'
-  project = %x[pwd].split('/').last.strip
-  system "git init"
-  system "heroku create" unless system "heroku create #{project}"
-  system "heroku addons:add sendgrid:starter"
-  system "heroku addons:add memcache"
-  system "heroku addons:add custom_domains:basic"
-  system "heroku addons:add zerigo_dns:basic"
-  system "bundle install"
-elsif action == 'deploy'
-  system 'towsta configure' unless system('heroku stack')
-  system 'git add .'
-  message = ARGV[1].nil? ? 'Deployed via Towsta gem' : ARGV[1]
-  system "git commit -a -m '#{message}'"
-  system 'git push -q' unless system 'git push heroku master -q'
-  puts 'Deploy is complete!'
-elsif action == 'help'
-  puts 'towsta new {projectname} {optional: secret}           to generate a new project'
-  puts 'towsta server {optional: port}                        to run the application server'
-  puts 'towsta console                                        to run the application console'
-  puts 'towsta deploy {optional: message}                     to deploy your application'
-else
-  puts 'Comand not found, try running "towsta help"'
-end
+require 'towsta'
+
+Towsta::Shell.send ARGV.first, ARGV.last

data/lib/towsta/envs/development.rb

@@ -1,5 +1,3 @@
-require "./towsta.rb"
-
 def sync_with_towsta params={}
   sync = Towsta::Synchronizer.new params: params, request: :all
   (Dir["./controllers/*.rb"] + Dir["./models/*.rb"]).each {|file| load file}

data/lib/towsta/envs/production.rb

@@ -1,13 +1,9 @@
-require "./towsta.rb"
-
 require 'dalli'
 set :cache, Dalli::Client.new
 require File.expand_path('../../memory', __FILE__)
 
 Towsta::Synchronizer.new params: {}, request: :structure
 
-(Dir["./controllers/*.rb"] + Dir["./models/*.rb"]).each {|file| require file}
-
 def sync_with_towsta params={}
   Towsta::Memory.recover(params).status
 end

data/lib/towsta/shell.rb

@@ -0,0 +1,22 @@
+module Towsta
+  class Shell
+    def self.sinatra_init *args
+      towsta_rb 'configs'
+      add_gem
+      system 'bundle install'
+    end
+
+    def self.towsta_rb folder
+      code  = "require 'towsta'\n\n"
+      code += "Towsta.secret = ''\n"
+      code += "#Towsta.author = 'your@email.com'\n"
+      code += "#Towsta.global = {}"
+      File.open("#{folder}/towsta.rb", 'w') {|f| f.write(code)}
+    end
+
+    def self.add_gem
+      gemfile = File.read("Gemfile") << "\ngem 'towsta'"
+      File.open("Gemfile", 'w') {|f| f.write(gemfile)}
+    end
+  end
+end

data/lib/towsta/version.rb

@@ -1,3 +1,3 @@
 module Towsta
-  VERSION = "2.0.10"
+  VERSION = "2.1.0"
 end

data/lib/towsta/vertical-core/locales.rb

@@ -2,7 +2,7 @@ module Towsta
 
   class VerticalCore
 
-    include R18n::Helpers
+    include R18n::Helpers rescue nil
 
     def i18n attr
       self.send :"#{attr.to_s}_#{R18n.get.locales.first.code}"

data/lib/towsta.rb

@@ -1,18 +1,8 @@
 #coding: utf-8
-require 'digest/md5'
 require 'net/http'
-require 'cgi'
 require 'json'
-require 'time'
-require 'date'
-require 'time'
 require 'bresson'
 require 'cameraman'
-require 'sinatra'
-require 'compass'
-require 'sinatra/content_for'
-require 'i18n-router'
-require 'pony'
 require 'active_support/all'
 
 require File.expand_path('../towsta/vertical-core/base', __FILE__)
@@ -24,8 +14,8 @@ require File.expand_path('../towsta/vertical-core/references', __FILE__)
 require File.expand_path('../towsta/kinds/main', __FILE__)
 require File.expand_path('../towsta/vertical', __FILE__)
 require File.expand_path('../towsta/synchronizer', __FILE__)
-require File.expand_path('../towsta/sinatra_extension', __FILE__)
 require File.expand_path('../towsta/login', __FILE__)
+require File.expand_path('../towsta/shell', __FILE__)
 require File.expand_path('../towsta/kinds/boolean', __FILE__)
 require File.expand_path('../towsta/kinds/date', __FILE__)
 require File.expand_path('../towsta/kinds/datetime', __FILE__)

data/towsta.gemspec

@@ -17,20 +17,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_dependency "bresson"
-  s.add_dependency "compass"
-  s.add_dependency "haml"
-  s.add_dependency "sinatra"
   s.add_dependency "cameraman"
-  s.add_dependency "sinatra-content-for"
-  s.add_dependency "i18n-router"
-  s.add_dependency "pony"
-  s.add_dependency "coffee-script"
   s.add_dependency "active_support"
   s.add_dependency 'dalli'
 
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'shotgun'
-  s.add_development_dependency 'heroku'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,227 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: towsta
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 10
-  version: 2.0.10
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mortaro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-06 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bresson
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: compass
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &26022804 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *26022804
+- !ruby/object:Gem::Dependency
+  name: bresson
+  requirement: &26022348 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26022348
+- !ruby/object:Gem::Dependency
   name: cameraman
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sinatra-content-for
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: i18n-router
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: pony
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &26021424 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26021424
+- !ruby/object:Gem::Dependency
   name: active_support
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &26020152 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: dalli
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *26020152
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: &26019720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: shotgun
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *26019720
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &26019180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: heroku
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id015
+  version_requirements: *26019180
 description: Simply integrates the towsta api
-email: 
+email:
 - mortaro@towsta.com
-executables: 
+executables:
 - towsta
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -251,7 +114,7 @@ files:
 - lib/towsta/kinds/video.rb
 - lib/towsta/login.rb
 - lib/towsta/memory.rb
-- lib/towsta/sinatra_extension.rb
+- lib/towsta/shell.rb
 - lib/towsta/synchronizer.rb
 - lib/towsta/version.rb
 - lib/towsta/vertical-core/attributes.rb
@@ -289,37 +152,28 @@ files:
 - spec/vertical/vertical_spec.rb
 - spec/webmock.json
 - towsta.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/towsta
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: towsta
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Api Integration gem with towsta
 test_files: []
-

data/lib/towsta/sinatra_extension.rb

@@ -1,54 +0,0 @@
-enable :sessions
-set :session_secret, ENV['SESSION_KEY']
-set :translations, 'locales'
-
-Pony.options = {
-  :via => :smtp,
-  :via_options => {
-    :address => 'smtp.sendgrid.net',
-    :port => '587',
-    :domain => 'heroku.com',
-    :user_name => ENV['SENDGRID_USERNAME'],
-    :password => ENV['SENDGRID_PASSWORD'],
-    :authentication => :plain,
-    :enable_starttls_auto => true
-  }
-}
-
-helpers do
-
-  def partial page
-    haml "partials/_#{page}".to_sym
-  end
-
-  def authenticate args
-    response = Towsta::Synchronizer.authentication_request args
-    session[:current_user] = response[:id] if response[:status]
-    response[:status]
-  end
-
-  def current_user
-    return User.find(session[:current_user]) if defined? User
-    session[:current_user]
-  end
-
-  def forget
-    session[:current_user] = nil
-  end
-
-end
-
-post '/flush' do
-  Towsta::Memory.flush
-  'CLEAR'
-end
-
-get '/stylesheets/:name.css' do
-  content_type 'text/css', :charset => 'utf-8'
-  sass(:"stylesheets/#{params[:name]}", Compass.sass_engine_options)
-end
-
-get '/js/:name.js' do
-  content_type 'text/javascript', :charset => 'utf-8'
-  coffee :"javascripts/#{params[:name]}"
-end