high_five 0.0.5 → 0.0.6

data/.rspec

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

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    high_five (0.0.4)
+    high_five (0.0.6)
       compass (~> 0.12.2)
+      json
       sprockets (~> 2.9.0)
       thor (~> 0.17.0)
       yui-compressor (~> 0.9.6)
@@ -14,14 +15,15 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    chunky_png (1.2.7)
+    chunky_png (1.2.8)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     diff-lcs (1.2.1)
     fssm (0.2.10)
-    hike (1.2.1)
+    hike (1.2.2)
+    json (1.7.7)
     multi_json (1.7.2)
     open4 (1.3.0)
     rack (1.5.2)
@@ -34,13 +36,13 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
     sass (3.2.7)
-    sprockets (2.9.0)
+    sprockets (2.9.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.17.0)
-    tilt (1.3.6)
+    tilt (1.3.7)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 

data/high_five.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "compass", "~>0.12.2"
   s.add_runtime_dependency "yui-compressor", "~>0.9.6"
   s.add_runtime_dependency "sprockets", "~>2.9.0"
+  s.add_runtime_dependency "json"
   s.add_development_dependency "rspec", "~>2.13.0"
 
   s.files         = `git ls-files`.split("\n")

data/lib/high_five/config.rb

@@ -1,3 +1,4 @@
+require 'json'
 module HighFive
   class Config
     attr_accessor :root,         # Root of the project 
@@ -9,7 +10,10 @@ module HighFive
       :static_stylesheets,
       :sass_files,
       :asset_paths,
-      :compass_dir
+      :platform_configs,
+      :compass_dir,
+      :js_settings, #serialized out to HighFive.Settings in index.html
+      :is_environment #boolean for if this config is an environment platform
 
 
     def self.configure(&block) 
@@ -47,6 +51,12 @@ module HighFive
         new_config.sass_files += self.sass_files
         new_config.asset_paths += self.asset_paths
         new_config.compass_dir ||= self.compass_dir
+        new_config.js_settings.merge! self.js_settings do |key, new_setting, old_setting| 
+          new_setting || old_setting #don't clobber settings from the parent
+        end
+        new_config.platform_configs = @platform_configs.reject do |key, platform_config|
+          key == platform
+        end
         return new_config
       else
         return self
@@ -61,6 +71,7 @@ module HighFive
         @sass_files = config.sass_files.dup
         @meta = config.meta.dup
         @asset_paths = config.asset_paths.dup
+        @js_settings = config.js_settings.dup
         self.root = config.root
         self.destination = config.destination
         self.page_title = config.page_title
@@ -73,7 +84,9 @@ module HighFive
         @meta = {}
         @platform_configs = {}
         @asset_paths = []
+        @js_settings = {}
       end
+      @is_environment = false
     end 
 
     def assets(path)
@@ -100,5 +113,22 @@ module HighFive
       @platform_configs[name.to_s] = HighFive::Config.new
       yield @platform_configs[name.to_s]
     end
+
+    def environment(name, &block)
+      platform(name, &block)
+      @platform_configs[name.to_s].is_environment = true
+    end
+
+    def setting(hash)
+      @js_settings.merge!(hash)
+    end
+    alias settings setting
+
+    def high_five_javascript
+      js = '<script type="text/javascript">'
+      js += "if(typeof(window.HighFive)==='undefined'){window.HighFive={};}window.HighFive.Settings=#{JSON.dump(js_settings)};"
+      js += '</script>'
+      js
+    end
   end
 end

data/lib/high_five/deploy_task.rb

@@ -17,7 +17,7 @@ module HighFive
           @weinre_url   = options[:weinre_url]
           @copy_files   = options[:"copy-files"]
           @meta         = {}
-          @config       = base_config.build_platform_config(@platform)
+          @config       = base_config.build_platform_config(@platform).build_platform_config(@environment)
           @config_root  = File.join("config", "high_five")
           
           self.source_paths << File.join(base_config.root, @config_root)
@@ -117,6 +117,7 @@ module HighFive
             end
           end
 
+          @high_five_javascript = @config.high_five_javascript
           # Build index.html
           say "Generating index.html"
           template File.join(@config_root, "index.html.erb"), File.join(self.destination_root, "index.html")

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
 end

data/spec/config_spec.rb

@@ -19,4 +19,63 @@ describe HighFive::Config do
     end
   end
 
+  context "settings" do 
+    before do 
+      HighFive::Config.configure do |config|
+        config.root = "/"
+        config.setting base_url: "http://example.com/api"
+        config.environment :production do |production|
+          production.setting base_url: "http://production.example.com/api"
+        end
+      end
+      @config = HighFive::Config.instance
+    end
+
+    it "should serialize all the settings to json" do
+      @config.high_five_javascript.should eq %q(<script type="text/javascript">if(typeof(window.HighFive)==='undefined'){window.HighFive={};}window.HighFive.Settings={"base_url":"http://example.com/api"};</script>)
+    end
+
+    example "platform settings should take precedence" do 
+      prod = @config.build_platform_config :production
+      prod.js_settings[:base_url].should eq "http://production.example.com/api"
+    end
+
+  end
+
+  context "environment configuration" do 
+    before do 
+      HighFive::Config.configure do |config|
+        config.root = "/"
+        config.setting base_url: "http://example.com/api"
+        config.platform :android do |android|
+          android.assets "android_asset"
+          android.setting android_flag: true
+        end
+        config.environment :production do |production|
+          production.assets "production_asset"
+          production.setting base_url: "http://production.example.com/api"
+        end
+      end
+      @config = HighFive::Config.instance
+    end
+
+    it "inherits from platforms" do 
+      config = @config.build_platform_config(:android).build_platform_config(:production)
+      config.static_assets.should include "android_asset"
+      config.static_assets.should include "production_asset"
+    end
+
+    it "doesn't care about the inherit order" do 
+      config = @config.build_platform_config(:production).build_platform_config(:android)
+      config.static_assets.should include "android_asset"
+      config.static_assets.should include "production_asset"
+    end
+
+    it "merges settings" do 
+      config = @config.build_platform_config(:android).build_platform_config(:production)
+      config.js_settings.should be_has_key(:base_url)
+      config.js_settings.should be_has_key(:android_flag)
+    end
+  end
+
 end

data/template/config/high_five/index.html.erb

@@ -16,6 +16,7 @@
                 </script>
             <% end -%>
         <% end -%>
+        <%= @high_five_javascript %>
         <%- @javascripts.each do |js| -%>
             <script type="text/javascript" src="<%= js %>"></script>
         <%- end -%>	

data/template/config/high_five.rb

@@ -11,6 +11,16 @@ HighFive::Config.configure do |config|
   # config.javascripts "http://maps.google.com/maps/api/js?sensor=true"
   # config.javascripts "lib/jquery-min.js"
 
+  # Run `compass compile` in this directory before doing anything
+  # config.compass "resources/sass"
+
+  # copy and include these stylesheets in the html
+  # config.stylesheets "resources/css/app.css"
+  # config.stylesheets "resources/css/jquery-ui.css"
+
+  # Basic key/value settings that will be available to your javascript
+  # config.setting base_url: "http://dev.example.com/api" # HighFive.settings.base_url = "http://dev.example.com/api"
+
   # Configure plaform specific settings like this
   # config.platform :ios do |ios|
   #   ios.assets "resources/ios"
@@ -18,6 +28,14 @@ HighFive::Config.configure do |config|
   # end
 
   # if you need platform-specific javascripts, 
-  # simply create app-<platform>.js next too app.js
+  # simply create app-<platform>.js 
+  # these files are managed by sprockets, and are used to determine the javascript include order
+
+  # Environment support: production/development/etc
+  # Environments work just like platforms
+  # config.environment :production do |prod|
+  #   production.javascripts "settings/production.js"
+  #   production.setting base_url: "http://production.example.com/api/" #these take precedence over the platform overrides
+  # end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement