sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/lib/sproutcore/tools/gen.rb

@@ -50,12 +50,11 @@ module SC
     desc "gen generator Namespace[.ClassName] [--target=TARGET_NAME] [--filename=FILE_NAME]",
       "Generates SproutCore components"
 
-    method_options(
-      MANIFEST_OPTIONS.merge(:help       => :string,
+    method_options(:help       => :string,
                              :filename   => :string,
                              :target     => :string,
                              '--dry-run' => false,
-                             :force      => false))
+                             :force      => false)
 
     def gen(*arguments)
       return show_help if arguments.empty?

data/lib/sproutcore/tools/manifest.rb

@@ -8,23 +8,29 @@
 module SC
   class Tools
 
-    # Standard manifest options.  Used by build tool as well.
-    MANIFEST_OPTIONS = { :symlink           => false,
-                         :stageroot         => :string,
-                         :format            => :string,
-                         :output            => :string,
-                         :all               => false,
-                         :buildroot         => :string,
-                         ['--languages', '-L']              => :string,
-                         ['--build-numbers', '-B']          => :string,
-                         ['--include-required', '-r']       => false }
-
     desc "manifest [TARGET..]", "Generates a manifest for the specified targets"
-    method_options(MANIFEST_OPTIONS.merge(
-      :format        => :string,
-      :only          => :string,
-      :except        => :string,
-      :hidden        => false ))
+    
+    # Standard manifest options.  Used by build tool as well.
+    method_option :languages, :type => :string,
+      :desc => "The languages to build."
+    method_option :symlink, :default => false
+    method_option :buildroot, :type => :string,
+      :desc => "The path to build to."
+    method_option :stageroot, :type => :string,
+      :desc => "The path to stage to."
+    method_option :format, :type => :string
+    method_option :output, :type => :string
+    method_option :all, :type => false
+    
+    method_option :build_numbers, :type => :string, :aliases => ['-B'],
+      :desc => "The identifier(s) for the build."
+    method_option :include_required, :default => false, :aliases => '-r',
+      :desc => "Deprecated. All builds build dependencies."
+      
+    method_option :format => :string
+    method_option :only => :string
+    method_option :except => :string
+    method_option :hidden => false
     def manifest(*targets)
 
       # Copy some key props to the env

data/lib/sproutcore/tools/server.rb

@@ -16,11 +16,32 @@ module SC
                     :host       => :string,
                     :irb        => false,
                     :filesystem => true
+    
+    method_option :whitelist, :type => :string,
+      :desc => "The whitelist to use when building. By default, Whitelist (if present)"
+    method_option :blacklist, :type => :string,
+      :desc => "The blacklist to use when building. By default, Blacklist (if present)"
+    method_option :accept, :type => :string,
+      :desc => "The SproutCore Accept file to determine which files to include. By default, Accept (if present)"
+
+    
+    method_option :allow_from_ips,
+      :default => "127.0.0.1",
+      :desc => "One or more (comma-separated) masks to accept requests from. " +
+        "For example: 10.*.*.*,127.0.0.1"
     def server
+      if options.help
+        help('server')
+        return
+      end
+      
       prepare_mode!('debug') # set mode again, using debug as default
 
       SC.env[:build_prefix]   = options[:buildroot] if options[:buildroot]
       SC.env[:staging_prefix] = options[:stageroot] if options[:stageroot]
+      SC.env[:whitelist_name] = options.whitelist
+      SC.env[:blacklist_name] = options.blacklist
+      SC.env[:accept_name]    = options.accept
 
       # get project and start service.
       project = requires_project!

data/spec/buildtasks/helpers/accept_list

@@ -0,0 +1,22 @@
+TARGET /target1/abc
+file[0-9].js
+
+DENY
+# This will deny the files we don't want, and one we do
+file[2-9].js
+
+# This will add one back
+allow file4.js
+
+# this will remove it again
+file4.js
+
+# And finally, add back the one we want.
+ALLOW
+file2.js
+
+
+TARGET /target1/def
+allow all
+
+deny file2.js

data/spec/buildtasks/helpers/accept_list.rb

@@ -0,0 +1,128 @@
+require "spec_helper"
+
+WHITELIST_PATH = File.dirname(__FILE__) + '/list.json'
+ACCEPT_LIST_PATH = File.dirname(__FILE__) + '/accept_list'
+
+
+module FileRuleListSpec
+  class YesRule
+    def include?(f)
+      true
+    end
+  end
+  
+  class NoRule
+    def include?(f)
+      false
+    end
+  end
+end
+
+describe "FileRuleList" do
+  it "includes if ignore_list has not been unset" do
+    list = SproutCore::FileRuleList.new
+    list.include?("target1", "some_file.js").should be_true
+  end
+  
+  it "does not include when there are no rules" do
+    list = SproutCore::FileRuleList.new
+    list.ignore_list = false
+    list.include?("target1", "some_file.js").should be_false
+  end
+  
+  it "includes when there is an allow rule" do
+    list = SproutCore::FileRuleList.new
+    list.add_rule("target1", FileRuleListSpec::YesRule.new)
+    list.include?("target1", "some_file.js").should be_true
+  end
+  
+  it "does not include when there is both a yes and a no rule" do
+    list = SproutCore::FileRuleList.new
+    list.add_rule("target1", FileRuleListSpec::YesRule.new)
+    list.add_rule("target1", FileRuleListSpec::NoRule.new)
+    list.include?("target1", "some_file.js").should be_false
+  end
+  
+  it "includes when there is a yes rule, followed by a no, followed by a yes" do
+    list = SproutCore::FileRuleList.new
+    list.add_rule("target1", FileRuleListSpec::YesRule.new)
+    list.add_rule("target1", FileRuleListSpec::NoRule.new)
+    list.add_rule("target1", FileRuleListSpec::YesRule.new)
+    list.include?("target1", "some_file.js").should be_true
+  end
+  
+  it "maintains separate lists for each target" do
+    list = SproutCore::FileRuleList.new
+    list.add_rule("target1", FileRuleListSpec::YesRule.new)
+    list.add_rule("target2", FileRuleListSpec::NoRule.new)
+    list.include?("target1", "some_file.js").should be_true
+    list.include?("target2", "some_file.js").should be_false
+  end
+  
+  it "obeys allow_by_default" do
+    list = SproutCore::FileRuleList.new
+    list.allow_by_default = true
+    list.include?("target1", "some_file.js").should be_true
+  end
+  
+  it "always allows the ALWAYS_ACCEPTED_FILE_TYPES, no matter what" do
+    list = SproutCore::FileRuleList.new
+    list.add_rule("target1", FileRuleListSpec::NoRule.new)
+    
+    [
+      '.manifest',
+      '.htm',
+      '.html',
+      '.rhtml',
+      '.png',
+      '.jpg',
+      '.jpeg',
+      '.gif'
+    ].each {|name|
+      list.include?("target1", "a_file#{name}").should be_true
+    }
+    
+    list.include?("target1", "some_file.js").should be_false
+  end
+    
+  
+
+  
+  describe "#read_json" do
+    it "reads in allow mode properly" do
+      list = SproutCore::FileRuleList.new
+      list.read_json(WHITELIST_PATH, :allow)
+      
+      list.include?("/target1/abc", "file1.js").should be_true
+      list.include?("/target1/abc", "file3.js").should be_false
+      list.include?("/target1/def", "file2.js").should be_false
+      list.include?("/target1/def", "file4.js").should be_true
+    end
+    
+    it "reads in deny mode properly" do
+      list = SproutCore::FileRuleList.new
+      list.allow_by_default = true
+      list.read_json(WHITELIST_PATH, :deny)
+      
+      list.include?("/target1/abc", "file1.js").should be_false
+      list.include?("/target1/abc", "file3.js").should be_true
+      list.include?("/target1/def", "file2.js").should be_true
+      list.include?("/target1/def", "file4.js").should be_false
+    end
+  end
+  
+  describe "#read" do
+    it "reads the list properly" do
+      list = SproutCore::FileRuleList.new
+      list.read(ACCEPT_LIST_PATH)
+      
+      list.include?("/target1/abc", "file1.js").should be_true
+      list.include?("/target1/abc", "file3.js").should be_false
+      
+      # Target1/def denies exactly one file: file2.js. Everything else is allowed.
+      list.include?("/target1/def", "file2.js").should be_false
+      list.include?("/target1/def", "fadjfhakljdf.js").should be_true
+    end
+  end
+end
+

data/spec/buildtasks/helpers/list.json

@@ -0,0 +1,11 @@
+{
+  "/target1/abc": [
+    "file1.js",
+    "file2.js"
+  ],
+  
+  "/target1/def": [
+    "file3.js",
+    "file4.js"
+  ]
+}

data/spec/buildtasks/manifest/prepare_build_tasks/chance_2x_spec.rb

@@ -53,48 +53,10 @@ describe "manifest:prepare_build_tasks:chance" do
       }
 
       x2_entry = entry_for(name + "@2x.css")
-      x2_entry[:chance_file].should == "chance@2x.css"
+      x2_entry[:chance_file].should == "chance-sprited@2x.css"
     end
     originals.size.should == 0
   end
 
-  it "generates js, and mhtml entries" do
-    run_task
-
-    have_entry('stylesheet.css')
-    have_entry('stylesheet@2x.css')
-    have_entry('__sc_chance.js')
-    have_entry('__sc_chance_mhtml.txt')
-
-    stylesheet = entry_for('stylesheet.css')
-  end
-
-  it "provides all chance instances to the mhtml and js entries" do
-    run_task
-
-    js_entry = entry_for('__sc_chance.js')
-    mhtml_entry = entry_for('__sc_chance_mhtml.txt')
-
-    resources = {}
-
-    originals = @manifest.entries(:hidden=>true).select {|entry|
-      entry.entry_type == :css and not entry.combined and not entry[:resource].nil?
-    }
-    originals.size.should > 0
-
-    originals.each do |entry|
-      next if entry[:resource].nil?
-
-      resources[entry[:resource]] ||= []
-      resources[entry[:resource]] << entry
-    end
-
-    resources.each do |name, entries|
-      chance_instance = entry_for(name + ".css")[:chance_instance]
-      js_entry.chance_instances.should include(chance_instance)
-      mhtml_entry.chance_instances.should include(chance_instance)
-    end
-
-  end
 end
 

data/spec/buildtasks/manifest/prepare_build_tasks/chance_spec.rb

@@ -62,43 +62,5 @@ describe "manifest:prepare_build_tasks:chance" do
     originals.size.should == 0
   end
 
-  it "generates js, and mhtml entries" do
-    run_task
-
-    have_entry('stylesheet.css')
-    have_entry('stylesheet@2x.css', false)
-    have_entry('__sc_chance.js')
-    have_entry('__sc_chance_mhtml.txt')
-
-    stylesheet = entry_for('stylesheet.css')
-  end
-
-  it "provides all chance instances to the mhtml and js entries" do
-    run_task
-
-    js_entry = entry_for('__sc_chance.js')
-    mhtml_entry = entry_for('__sc_chance_mhtml.txt')
-
-    resources = {}
-
-    originals = @manifest.entries(:hidden=>true).select {|entry|
-      entry.entry_type == :css and not entry.combined and not entry[:resource].nil?
-    }
-    originals.size.should > 0
-
-    originals.each do |entry|
-      next if entry[:resource].nil?
-
-      resources[entry[:resource]] ||= []
-      resources[entry[:resource]] << entry
-    end
-
-    resources.each do |name, entries|
-      chance_instance = entry_for(name + ".css")[:chance_instance]
-      js_entry.chance_instances.should include(chance_instance)
-      mhtml_entry.chance_instances.should include(chance_instance)
-    end
-
-  end
 end
 

data/spec/buildtasks/manifest/prepare_build_tasks/combine_spec.rb

@@ -201,7 +201,7 @@ describe "manifest:prepare_build_tasks:combine" do
 
         # get the expected set of ordered entries...based on contents of
         # project...
-        expected = %w(source/lproj/strings.js source/core.js source/utils.js __sc_chance.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js source/t.js source/resources/main_page.js source/main.js)
+        expected = %w(source/lproj/strings.js source/core.js source/utils.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js source/t.js source/resources/main_page.js source/main.js)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }
@@ -241,7 +241,7 @@ describe "manifest:prepare_build_tasks:combine" do
 
         # get the expected set of ordered entries...based on contents of
         # project... note that we require 'd', which should match 'lproj/d'
-        expected = %w(__sc_chance.js source/c.js source/a.js source/lproj/d.js source/b.js)
+        expected = %w(source/c.js source/a.js source/lproj/d.js source/b.js)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }
@@ -337,14 +337,14 @@ describe "manifest:prepare_build_tasks:combine" do
       run_task
     end
 
-    it " should be included in the requirements" do
+    it " should not be included in the requirements" do
       target = target_for('photos')
       target_requirements = target.required_targets
 
       preferences_module = target.target_for('photos/preferences')
       email_module = target.target_for('photos/email')
 
-      target_requirements.should include(preferences_module)
+      target_requirements.should_not include(preferences_module)
       target_requirements.should_not include(email_module)
     end
   end

data/spec/buildtasks/manifest/prepare_build_tasks/module_spec.rb

@@ -69,14 +69,14 @@ describe "Target#modules" do
       run_task
     end
 
-    it "it should be included in the requirements" do
+    it "it should not be included in the requirements" do
       target = target_for('photos')
       target_requirements = target.required_targets
 
       preferences_module = target.target_for('photos/preferences')
       email_module = target.target_for('photos/email')
 
-      target_requirements.should include(preferences_module)
+      target_requirements.should_not include(preferences_module)
       target_requirements.should_not include(email_module)
     end
   end

data/spec/buildtasks/manifest/prepare_build_tasks/packed_2x_indirect_spec.rb

@@ -115,7 +115,13 @@ describe "manifest:prepare_build_tasks:packed" do
 
      before do
        run_task
-       @entry = entry_for('stylesheet-packed.css')
+       
+       # for 1x (but not 2x) there should be an intermediary entry for a transform
+       # (split_css) that... splits the CSS. See its documentation.
+       #
+       # we are looking for the stylesheet-packed.css that is set on its source entry.
+       @entry = entry_for('stylesheet-packed.css')[:source_entry]
+       
        @entry_2x = entry_for('stylesheet@2x-packed.css')
      end
 
@@ -129,11 +135,6 @@ describe "manifest:prepare_build_tasks:packed" do
        @entry.source_entries.each do |entry|
          entry.filename.should == 'stylesheet.css'
        end
-
-       @entry_2x.source_entries.size.should > 0
-       @entry_2x.source_entries.each do |entry|
-         entry.filename.should == 'stylesheet@2x.css'
-       end
      end
 
      it "should include ordered_entries ordered by required target order" do
@@ -151,16 +152,6 @@ describe "manifest:prepare_build_tasks:packed" do
          entry.target.should == targets.shift
        end
 
-       targets = @target.expand_required_targets(:theme => true) + [@target]
-       variation = @entry.manifest.variation
-       targets.reject! do |t|
-         t.manifest_for(variation).build!.entry_for('stylesheet@2x.css').nil?
-       end
-
-       @entry_2x.ordered_entries.each do |entry|
-         entry.target.should == targets.shift
-       end
-
      end
 
      it "should include the actual targets this packed version covers in the targets property (even those w no stylesheet.css)" do