spontaneous 0.2.0.alpha5 → 0.2.0.alpha6

data/Gemfile

@@ -10,8 +10,5 @@ group :development do
   gem 'shoulda', '~> 2.11.3', :git => 'https://github.com/dasch/shoulda.git', :branch => 'minitest'
   gem 'selenium-client', '~> 1.2.18', :platforms => [:mri_18]
   # gem 'Selenium', '~> 1.1.14'
-  gem 'harmony',    '~> 0.5', :platforms => [:mri_18]
-  gem 'ruby-debug', :platforms => [:mri_18]
-  gem 'locat', :path => '/Users/garry/Dropbox/Development/spontaneous3/locat'
 end
 

data/Rakefile

@@ -121,6 +121,12 @@ namespace :test do
     test.pattern = 'test/javascript/**/test_*.rb'
     test.verbose = true
   end
+  Rake::TestTask.new(:integration) do |test|
+    test.libs << 'test'
+    test.ruby_opts << '-rubygems'
+    test.pattern = 'test/integration/**/test_*.rb'
+    test.verbose = true
+  end
 end
 
 

data/lib/spontaneous/schema.rb

@@ -33,18 +33,25 @@ module Spontaneous
       end
 
       def load_map
-        if exists?
-          map = YAML.load_file(@path)
+        if exists? && (map = parse_map)
           map.each do | uid, reference |
             uids.load(uid, reference)
           end
         end
       end
 
+      def parse_map
+        YAML.load_file(@path)
+      end
+
       def exists?
         ::File.exists?(@path)
       end
 
+      def valid?
+        exists? && parse_map.is_a?(Hash)
+      end
+
       # def invert_map
       #   @inverse_map = generate_inverse
       # end
@@ -86,6 +93,10 @@ module Spontaneous
       def exists?
         true
       end
+
+      def valid?
+        true
+      end
     end
 
     class Schema
@@ -112,7 +123,8 @@ module Spontaneous
           changes = e.modification
           # if the map file is missing, then this is a first run and we can just
           # create the thing by populating it with the current schema
-          if !map.exists?
+
+          if !map.valid?
             logger.warn("Generating new schema")
             generate_new_schema
           else

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.alpha5"
+  VERSION = "0.2.0.alpha6"
   GEM = false
 end

data/spontaneous.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'spontaneous'
-  s.version           = '0.2.0.alpha5'
-  s.date              = '2012-10-16'
+  s.version           = '0.2.0.alpha6'
+  s.date              = '2012-10-17'
   s.rubyforge_project = 'spontaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('activesupport',   ["~> 3.2.0"])
+  s.add_dependency('i18n',            ["~> 0.6.0"]) # this is an undeclared activesupport dependency
   s.add_dependency('base58',          ["~> 0.1.0"])
   s.add_dependency('bundler',         ["> 1.0.15"])
   s.add_dependency('coffee-script',   ["~> 2.2.0"])
@@ -737,12 +738,14 @@ Gem::Specification.new do |s|
     test/functional/test_back.rb
     test/functional/test_front.rb
     test/functional/test_user_manager.rb
+    test/integration/test_installation.rb
     test/javascript/env.js
     test/javascript/test_dom.rb
     test/javascript/test_markdown.rb
     test/support/custom_matchers.rb
     test/support/timing.rb
     test/test_helper.rb
+    test/test_integration_helper.rb
     test/test_javascript.rb
     test/ui/test_page_editing.rb
     test/ui_helper.rb

data/test/integration/test_installation.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_integration_helper', __FILE__)
+
+describe "Installation" do
+  def system(command)
+    puts "SYSTEM #{command.inspect}"
+    Kernel.system command
+  end
+
+  before do
+    @root = Dir.mktmpdir
+    Dir.chdir(@root)
+    puts "root.before"
+  end
+
+  describe "when starting with a base system" do
+    before do
+      puts "describe.before"
+    end
+
+    it "will allow the installation of the spontaneous gem" do
+      assert_raises "Precondition failed, spontaneous gem is already installed", Gem::LoadError do
+        Gem::Specification.find_by_name("spontaneous")
+      end
+      system "gem install spontaneous --prerelease --no-rdoc --no-ri"
+      spec = Gem::Specification.find_by_name("spontaneous")
+      asssert_instance_of Gem::Specification, spec, "spontaneous gem should have been installed"
+    end
+  end
+end

data/test/test_integration_helper.rb

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+
+# Helpers for integration tests
+require "rubygems"
+require "bundler/setup"
+require "minitest/spec"
+require "minitest/autorun"
+require 'tmpdir'
+require 'pp'

data/test/unit/test_schema.rb

@@ -611,9 +611,26 @@ class SchemaTest < MiniTest::Spec
 
   context "Map writing" do
     context "Non-existant maps" do
+      def expected_schema
+        classes = [ ::A, ::B]
+        expected = Hash[ classes.map { |klass| [ klass.schema_id.to_s, klass.schema_name ] } ]
+        expected.merge!({
+          A.field_prototypes[:title].schema_id.to_s => A.field_prototypes[:title].schema_name,
+          A.field_prototypes[:introduction].schema_id.to_s => A.field_prototypes[:introduction].schema_name,
+          A.layout_prototypes[:sparse].schema_id.to_s => A.layout_prototypes[:sparse].schema_name,
+          A.boxes[:posts].schema_id.to_s => A.boxes[:posts].schema_name,
+          A.boxes[:posts].field_prototypes[:description].schema_id.to_s => A.boxes[:posts].field_prototypes[:description].schema_name,
+          B.field_prototypes[:location].schema_id.to_s => B.field_prototypes[:location].schema_name,
+          B.style_prototypes[:daring].schema_id.to_s => B.style_prototypes[:daring].schema_name,
+        })
+        expected
+      end
+
       setup do
         @map_file = File.expand_path('../../../tmp/schema.yml', __FILE__)
-        ::File.exists?(@map_file).should be_false
+
+        ::FileUtils.rm_f(@map_file) if ::File.exists?(@map_file)
+
         @site.schema.schema_map_file = @map_file
         class ::A < Spontaneous::Page
           field :title
@@ -628,29 +645,30 @@ class SchemaTest < MiniTest::Spec
           style :daring
         end
       end
+
       teardown do
         Object.send(:remove_const, :A) rescue nil
         Object.send(:remove_const, :B) rescue nil
         FileUtils.rm(@map_file) if ::File.exists?(@map_file)
       end
+
       should "get created with verification" do
         S.schema.validate!
-        classes = [ ::A, ::B]
-        @inheritance_map = nil
-        # would like to do all of this using mocks, but don't know how to do that
-        # without fecking up the whole schema id creation process
-        expected = Hash[ classes.map { |klass| [ klass.schema_id.to_s, klass.schema_name ] } ]
-        expected.merge!({
-          A.field_prototypes[:title].schema_id.to_s => A.field_prototypes[:title].schema_name,
-          A.field_prototypes[:introduction].schema_id.to_s => A.field_prototypes[:introduction].schema_name,
-          A.layout_prototypes[:sparse].schema_id.to_s => A.layout_prototypes[:sparse].schema_name,
-          A.boxes[:posts].schema_id.to_s => A.boxes[:posts].schema_name,
-          A.boxes[:posts].field_prototypes[:description].schema_id.to_s => A.boxes[:posts].field_prototypes[:description].schema_name,
-          B.field_prototypes[:location].schema_id.to_s => B.field_prototypes[:location].schema_name,
-          B.style_prototypes[:daring].schema_id.to_s => B.style_prototypes[:daring].schema_name,
-        })
         File.exists?(@map_file).should be_true
-        YAML.load_file(@map_file).should == expected
+        YAML.load_file(@map_file).should == expected_schema
+      end
+
+      # Having the generator create an empty config/schema.yml is a useful way of
+      # identifying a spontaneous site (for use by bin/spot)
+      should "get overwritten if invalid or empty" do
+        File.open(@map_file, "w") do |f|
+          f.write("# schema")
+        end
+        File.exists?(@map_file).should be_true
+        S.schema.map.valid?.should be_false
+        S.schema.validate!
+        S.schema.map.valid?.should be_true
+        YAML.load_file(@map_file).should == expected_schema
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha5
+  version: 0.2.0.alpha6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: base58
   requirement: !ruby/object:Gem::Requirement
@@ -1315,12 +1331,14 @@ files:
 - test/functional/test_back.rb
 - test/functional/test_front.rb
 - test/functional/test_user_manager.rb
+- test/integration/test_installation.rb
 - test/javascript/env.js
 - test/javascript/test_dom.rb
 - test/javascript/test_markdown.rb
 - test/support/custom_matchers.rb
 - test/support/timing.rb
 - test/test_helper.rb
+- test/test_integration_helper.rb
 - test/test_javascript.rb
 - test/ui/test_page_editing.rb
 - test/ui_helper.rb
@@ -1392,4 +1410,5 @@ specification_version: 2
 summary: Spontaneous is a next-generation Ruby CMS
 test_files:
 - test/test_helper.rb
+- test/test_integration_helper.rb
 - test/test_javascript.rb