myway 0.1.6 → 0.2.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README.md

@@ -28,6 +28,12 @@ And to start a new sinatra project:
 
 CHANGE LOG
 
+Version 0.2.0
+    - replace head.js with yepnope.js for javascript loader
+    - dynamically append path for sprockets for assets
+    - adding path for images noted by grandslam
+    - refactoring
+
 Version 0.1.3
     - adds head, backbone, underscore js in assets pipeline
     - scaffolds capistrano deploy script

data/lib/myway.rb

@@ -11,7 +11,7 @@ JS_LIBS = {
     'underscore' => 'http://documentcloud.github.com/underscore/underscore-min.js',
     'bootstrap' => 'http://twitter.github.com/bootstrap/assets/bootstrap.zip',
     'kickstart' => 'http://www.99lime.com/downloads/',
-    'yepnope' => 'https://github.com/SlexAxton/yepnope.js/zipball/master'
+    'yepnope' => 'https://github.com/SlexAxton/yepnope.js/archive/master.zip'
 }
 class String
   def camelize(first_letter_in_uppercase = true)
@@ -96,24 +96,34 @@ module Myway
         }
       end
 
-      def build_js_libs(libs=%w(head underscore backbone bootstrap))
+      def build_js_libs(libs=%w(yepnope underscore backbone bootstrap))
 
         libs.each do |lib|
           begin
-            if lib != "bootstrap"
-              File.open "./assets/js/#{lib}.min.js", 'w+' do |file|
+            if lib == "bootstrap" or lib == "yepnope"
+              File.open "assets/#{lib}.zip", 'wb' do |file|
                 file.write get_latest(lib)
               end
+              unzip_file "./assets/#{lib}.zip", "./assets/"
+              File.delete "./assets/#{lib}.zip"
+            end
+
+            case lib
+            when "yepnope"
+              `mv ./assets/#{lib}.js-master/#{lib}.js ./assets/js/`
+              `mv ./assets/#{lib}.js-master/filters ./assets/js/`
+              `mv ./assets/#{lib}.js-master/plugins ./assets/js/`
+              `mv ./assets/#{lib}.js-master/prefixes ./assets/js/`
+              FileUtils.rm_rf "./assets/#{lib}.js-master/" if lib == "yepnope"
+            when "bootstrap"
+              `mv ./assets/#{lib}/js/* ./assets/js/`
+              `mv ./assets/#{lib}/css ./assets/`
+              `mv ./assets/#{lib}/img ./assets/`
+              FileUtils.rm_rf "./assets/#{lib}/" if lib == "bootstrap"
             else
-              File.open "assets/js/#{lib}.zip", 'wb' do |file|
+              File.open "./assets/js/#{lib}.min.js", 'w+' do |file|
                 file.write get_latest(lib)
               end
-              unzip_file "./assets/js/#{lib}.zip", "./assets/"
-              File.delete "./assets/js/#{lib}.zip"
-              `mv ./assets/bootstrap/js/* ./assets/js/`
-              `mv ./assets/bootstrap/css/ ./assets/`
-              `mv ./assets/bootstrap/img/ ./assets/`
-              FileUtils.rm_rf "./assets/bootstrap/"
             end
           rescue Errno::ETIMEDOUT, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
             say "#{e} Error while getting #{lib}.js"
@@ -152,8 +162,6 @@ module Myway
 
             template "myway/templates/spec/specHelper.js.tt", "#{name}/spec/javascripts/helpers/specHelper.js"
             template "myway/templates/spec/fixtures.js.tt", "#{name}/spec/javascripts/fixtures/fixtures.js"
-
-
         end
       end
     end

data/lib/myway/templates/app/app.tt

@@ -1,14 +1,15 @@
-require "sinatra/reloader"
+#require "sinatra/reloader"
 require "yaml"
 require "sprockets"
 require "haml"
+require "pathname"
 
 class <%= name.camelize %> < Sinatra::Base
 
   set :app_path, '/'
 
   configure :development do
-    register Sinatra::Reloader
+    #register Sinatra::Reloader
   end
 
   set :logging, true
@@ -16,8 +17,7 @@ class <%= name.camelize %> < Sinatra::Base
   set :assets, Sprockets::Environment.new
 
   # Configure sprockets
-  settings.assets.append_path "assets/js"
-  settings.assets.append_path "assets/css"
+  Dir.glob('assets/**/*/').select { |d| settings.assets.append_path "#{d}" if File.directory? d }
 
   # For compressed JS and CSS output
   require "yui/compressor"
@@ -28,6 +28,12 @@ class <%= name.camelize %> < Sinatra::Base
     haml :index
   end
 
+  get "/img/:file" do
+    file = params[:file].split(".")
+    content_type "image/#{file[1]}"
+    settings.assets["#{file[0]}.#{file[1]}"]
+  end
+
   get "/js/:file.js" do
     content_type "application/javascript"
     settings.assets["#{params[:file]}.js"]

data/lib/myway/templates/app/views/includes/navbar.haml.tt

@@ -5,7 +5,7 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      %a.brand{:href => "#"} Project <%= name %>
+      %a.brand{:href => "#"} Project <%= name.camelize %>
       .nav-collapse
         %ul.nav
           %li.active

data/lib/myway/templates/app/views/index.haml.tt

@@ -0,0 +1,8 @@
+.hero-unit
+  %h1 MyWay
+  %p It is just a base tool to build your own sinatra way - ftaher
+  %p
+    %a.btn.btn-primary.btn-large{:href=> "https://github.com/mftaher/myway"}
+      Fork me on Github
+
+

data/lib/myway/templates/app/views/layout.haml.tt

@@ -1,36 +1,37 @@
 !!!
 %html
   %head
-    %title Project: <%= name %>
-    %meta(name='viewport' content='width=device-width, initial-scale=1.0')
-    %meta(name='description' content='')
-    %meta(name='author' content='')
-    %script{:src=> "/js/head.min.js"}
-    %link(href='/css/bootstrap.css' rel='stylesheet')
+    %title Project: <%= name.camelize %>
+    %meta{:name=>'viewport', :content=>'width=device-width, initial-scale=1.0'}
+    %meta{:name=>'description', :content=>''}
+    %meta{:name=>'author', :content=>''}
+    %script{:src=> "/js/yepnope.js"}
+    %link{:href=>'/css/bootstrap.css', :rel=>'stylesheet'}
     %style
       body {padding-top: 60px;} /* 60px to make the container go all the way to the bottom of the topbar */
-    %link(href='/css/bootstrap-responsive.css' rel='stylesheet')
+    %link{:href=>'/css/bootstrap-responsive.css', :rel=>'stylesheet'}
 
     //Le HTML5 shim, for IE6-8 support of HTML5 elements
     //if lt IE 9
-    %script(src='http://html5shim.googlecode.com/svn/trunk/html5.js')
+    %script{:src=>'http://html5shim.googlecode.com/svn/trunk/html5.js'}
     //Le fav and touch icons
-    %link(rel='shortcut icon' href='/assets/ico/favicon.ico')
-    %link(rel='apple-touch-icon-precomposed' sizes='114x114' href='/assets/ico/apple-touch-icon-114-precomposed.png')
-    %link(rel='apple-touch-icon-precomposed' sizes='72x72' href='/assets/ico/apple-touch-icon-72-precomposed.png')
-    %link(rel='apple-touch-icon-precomposed' href='/assets/ico/apple-touch-icon-57-precomposed.png')
+    %link{:rel=>'shortcut icon', :href=>'/assets/ico/favicon.ico'}
+    %link{:rel=>'apple-touch-icon-precomposed', :sizes=>'114x114', :href=>'/assets/ico/apple-touch-icon-114-precomposed.png'}
+    %link{:rel=>'apple-touch-icon-precomposed', :sizes=>'72x72', :href=>'/assets/ico/apple-touch-icon-72-precomposed.png'}
+    %link{:rel=>'apple-touch-icon-precomposed', :href=>'/assets/ico/apple-touch-icon-57-precomposed.png'}
 
   %body
     = haml :'includes/navbar'
     .container
       =yield
     %script
-      head.js(
+      yepnope({
+      load:[
       "/js/underscore.min.js", "/js/backbone.min.js",
       "/js/bootstrap-alert.js", "/js/bootstrap-dropdown.js",
       "/js/bootstrap-modal.js","/js/bootstrap-tooltip.js"
       //"/js/bootstrap-button.js","/js/bootstrap-collapse.js","/js/bootstrap-carousel.js",
       //"/js/bootstrap-popover.js","/js/bootstrap-scrollspy.js","/js/bootstrap-tab.js",
-      //"/js/bootstrap-transition.js","/js/bootstrap-typeahead.js"
-      )
+      //"/js/bootstrap-transition.js","/js/bootstrap-typeahead.js"]
+      })
 

data/lib/myway/templates/config.ru.tt

@@ -1,3 +1,4 @@
+require "sinatra/base"
 APP_ROOT = File.expand_path(File.dirname(__FILE__))
 $: << "#{APP_ROOT}/app/"
 

data/lib/myway/version.rb

@@ -1,3 +1,3 @@
 module Myway
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require "rspec"
+require "../lib/myway"
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myway
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -64,6 +65,10 @@ files:
 - lib/myway/templates/app/views/includes/navbar.haml.tt
 - lib/myway/templates/app/views/index.haml.tt
 - lib/myway/templates/app/views/layout.haml.tt
+- lib/myway/templates/backbone/collection.js.tt
+- lib/myway/templates/backbone/model.js.tt
+- lib/myway/templates/backbone/route.js.tt
+- lib/myway/templates/backbone/view.js.tt
 - lib/myway/templates/config.ru.tt
 - lib/myway/templates/config/deploy.rb.tt
 - lib/myway/templates/config/unicorn.tt
@@ -79,6 +84,7 @@ files:
 - lib/myway/templates/spec/spec_helper.rb.tt
 - lib/myway/version.rb
 - myway.gemspec
+- spec/spec_helper.rb
 homepage: http://github.com/mftaher/myway
 licenses: []
 post_install_message: 
@@ -103,5 +109,6 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Scaffolding application for Sinatra web applications
-test_files: []
+test_files:
+- spec/spec_helper.rb
 has_rdoc: