calatrava 0.6.2 → 0.6.3

data/CHANGES.markdown

@@ -1,3 +1,25 @@
+## v0.6.3
+
+Bugs fixed:
+* [Issue #22][i22] and [Issue #23][i23]: Support `*.scss` files as
+  well as `*.sass` files.
+* [Issue #24][i24]: Create the stylesheet output directories as part
+  of the build process.
+* [Issue #25][i25]: Recreate the `load_file.txt` when the feature
+  manifest changes.
+* iOS was correctly dispatching timer firings back to the controller
+  code.
+
+## v0.6.2
+
+* Moving to a more recent version of the `xcodeproj` gem caused a
+  conflict with Frank that needed to be resolved.
+
+## v0.6.1
+
+* iOS was not correctly loading HTML UIs. Fixing this also required
+  re-working the project creation.
+
 ## v0.6.0
 
 * Added
@@ -38,3 +60,7 @@ Changes that will affect existing projects:
 [i13]: https://github.com/calatrava/calatrava/issues/13
 [i14]: https://github.com/calatrava/calatrava/issues/14
 [i15]: https://github.com/calatrava/calatrava/issues/15
+[i22]: https://github.com/calatrava/calatrava/issues/22
+[i23]: https://github.com/calatrava/calatrava/issues/23
+[i24]: https://github.com/calatrava/calatrava/issues/24
+[i25]: https://github.com/calatrava/calatrava/issues/25

data/lib/calatrava/app_builder.rb

@@ -36,6 +36,7 @@ module Calatrava
       directory build_html_dir
       directory build_images_dir
       directory build_scripts_dir
+      directory build_styles_dir
 
       app_files = haml_files.collect do |hf|
         file "#{build_html_dir}/#{File.basename(hf, '.haml')}.html" => [build_html_dir, hf] do
@@ -50,7 +51,7 @@ module Calatrava
       end
 
       app_files += @manifest.css_tasks(build_styles_dir)
-      app_files << file("#{build_dir}/load_file.txt" => build_dir) do |t|
+      app_files << file("#{build_dir}/load_file.txt" => [build_dir, @manifest.src_file]) do |t|
         File.open(t.name, "w+") { |f| f.puts load_instructions }
       end
 

data/lib/calatrava/manifest.rb

@@ -1,9 +1,14 @@
 module Calatrava
 
   class Manifest
+    include Rake::DSL
+
+    attr_reader :src_file
+
     def initialize(path, app_dir, kernel, shell)
       @path, @kernel, @shell = path, kernel, shell
-      @feature_list = YAML.load(IO.read("#{@path}/#{app_dir}/manifest.yml"))
+      @src_file = "#{app_dir}/manifest.yml"
+      @feature_list = YAML.load(IO.read("#{@path}/#{@src_file}"))
     end
 
     def features
@@ -40,9 +45,10 @@ module Calatrava
     end
 
     def css_tasks(output_dir)
+      mkdir_p output_dir
       css_files.collect do |style_file|
         file "#{output_dir}/#{File.basename(style_file, '.*')}.css" => [output_dir, style_file] do |t|
-          if style_file =~ /css$/
+          if style_file =~ /\.css$/
             cp style_file, output_dir
           else
             sh "sass #{style_file} #{t.name}"

data/lib/calatrava/mobile_web_app.rb

@@ -33,6 +33,7 @@ module Calatrava
     def install_tasks
       directory build_dir
       directory scripts_build_dir
+      directory styles_build_dir
 
       app_files = coffee_files.collect do |cf|
         file "#{scripts_build_dir}/#{File.basename(cf, '.coffee')}.js" => [scripts_build_dir, cf] do
@@ -40,7 +41,7 @@ module Calatrava
         end
       end
 
-      app_files << file("#{build_dir}/index.html" => ["web/app/views/index.haml"] + haml_files) do
+      app_files << file("#{build_dir}/index.html" => [@manifest.src_file, "web/app/views/index.haml"] + haml_files) do
         HamlSupport::compile "web/app/views/index.haml", build_dir
       end
 

data/lib/calatrava/shell.rb

@@ -19,7 +19,9 @@ module Calatrava
 
     def css_files
       Dir.chdir @path do
-        Dir["shell/stylesheets/*.sass"] + Dir["shell/stylesheets/*.css"]
+        ["sass", "scss", "css"].collect do |ext|
+          Dir["shell/stylesheets/*.#{ext}"]
+        end.flatten
       end
     end
 

data/lib/calatrava/templates/ios/Podfile.calatrava

@@ -3,7 +3,7 @@ platform :ios, '5.0'
 xcodeproj '{{ project_name}}.xcodeproj'
 
 {{^dev?}}
-pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '51391eb66a605801351e65a670b9466082623a3c'
+pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => 'ba10050a6f565d7ac10b541ffe6164174db11376'
 {{/dev?}}
 {{#dev?}}
 pod 'calatrava', :local => '../../../calatrava-ios'

data/lib/calatrava/templates/package.json

@@ -9,7 +9,7 @@
     , "jsdom"         : "latest"
     , "mime"          : "latest"
     , "ws"            : "0.4.8"
-    , "jasmine-node"  : "*"
+    , "jasmine-node"  : "1.0.26"
     , "should"        : "*"
     , "jasmine-reporters" : "*"
     , "walkdir"       : "*"

data/lib/calatrava/templates/web/app/source/init.coffee

@@ -2,12 +2,9 @@ root = this
 root.calatrava ?= {}
 calatrava = root.calatrava
 
-# Replace with your namespace
-root.example ?= {}
-example = root.example
-
 # Hide all the sub-pages when first launching the app
-$('body > .page').hide()
+$(document.ready) ->
+  $('body > .container > .page').hide()
 
 window.onpopstate = (event) ->
   if event.state

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.2"
+  Version = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091946480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70114091946480
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091968780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70114091968780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091968260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.5
+  version_requirements: *70114091968260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091967760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
+  version_requirements: *70114091967760
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091967300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.7
+  version_requirements: *70114091967300
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091966840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+  version_requirements: *70114091966840
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091966360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.99.4
+  version_requirements: *70114091966360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091965860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+  version_requirements: *70114091965860
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091965280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +109,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+  version_requirements: *70114091965280
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091964660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,15 +120,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+  version_requirements: *70114091964660
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70114091963860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,12 +131,7 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
+  version_requirements: *70114091963860
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
@@ -341,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: calatrava
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Cross-platform mobile apps with native UIs