smallcage 0.2.4 → 0.2.5

data/spec/{export_spec.rb → lib/smallcage/commands/export_spec.rb}

@@ -2,18 +2,17 @@ require 'spec_helper.rb'
 require 'smallcage'
 
 describe "SmallCage::Commands::Export" do
+  docroot = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs2'))
+  outdir = Pathname.new(File.join(SPEC_DATA_DIR, 'out'))
 
-  docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs2")
-  outdir = Pathname.new(File.dirname(__FILE__) + "/data/out")
-  
   it "should export not smc files" do
     begin
-      opts = { :command => "export", 
+      opts = { :command => "export",
                :path => docroot.to_s,
                :out => outdir.to_s,
                :quiet => true }
       SmallCage::Runner.run(opts)
-    
+
       (outdir + "./a/test.html.smc").exist?.should_not be_true
       (outdir + "./a/test.html").exist?.should_not be_true
       (outdir + "./a/b/test.html").exist?.should be_true
@@ -22,24 +21,23 @@ describe "SmallCage::Commands::Export" do
       FileUtils.rm_r(outdir)
     end
   end
-  
+
   it "should export project subdirectory" do
     begin
       path = docroot + "a/b/c"
-      opts = { :command => "export", 
+      opts = { :command => "export",
                :path => path.to_s,
                :out => outdir.to_s,
                :quiet => true }
       SmallCage::Runner.run(opts)
-    
+
       (outdir + "./a/test.html.smc").exist?.should_not be_true
       (outdir + "./a/test.html").exist?.should_not be_true
       (outdir + "./a/b/test.html").exist?.should_not be_true
-      
+
       (outdir + "./a/b/c/test.html").exist?.should be_true
     ensure
       FileUtils.rm_r(outdir)
     end
   end
-  
 end

data/spec/{import_spec.rb → lib/smallcage/commands/import_spec.rb}

@@ -2,19 +2,18 @@ require 'spec_helper.rb'
 require 'smallcage'
 
 describe "SmallCage::Commands::Import" do
-  root = Pathname.new(File.dirname(__FILE__) + "/data")
-  
+  root = Pathname.new(SPEC_DATA_DIR)
+
   it "should import default project" do
     tmpdir = root + "tmp"
     Dir.mkdir(tmpdir) unless tmpdir.directory?
-    
+
     opts = { :command => "import", :from => "default", :to => tmpdir.to_s, :quiet => true }
     SmallCage::Runner.run(opts)
-    
+
     (tmpdir + "_smc").directory?.should be_true
     (tmpdir + "_smc/helpers/base_helper.rb").file?.should be_true
-    
+
     FileUtils.rm_r(tmpdir)
   end
-  
 end

data/spec/{manifest_spec.rb → lib/smallcage/commands/manifest_spec.rb}

@@ -1,10 +1,11 @@
 require 'spec_helper.rb'
 require 'smallcage'
+require 'smallcage/commands/manifest'
 
-describe "SmallCage::Commands::Manifest" do
+describe SmallCage::Commands::Manifest do
 
   before do
-    @docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    @docroot = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs1'))
     @opts = { :path => @docroot.to_s }
     @manifest_file = @docroot + "Manifest.html"
   end
@@ -32,7 +33,7 @@ EOT
       contents.should include(line)
     end
   end
-  
+
   after do
     SmallCage::Runner.run(@opts.merge(:command => "clean", :quiet => true))
     @manifest_file.delete

data/spec/{update_spec.rb → lib/smallcage/commands/update_spec.rb}

@@ -1,21 +1,22 @@
 require 'spec_helper.rb'
 require 'smallcage'
+require 'smallcage/commands/update'
 
-describe 'update' do
+describe SmallCage::Commands::Update do
 
   it "should not update docroot directory" do
-    docroot  = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    docroot  = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs1'))
     path = docroot + "a/b/"
 
     opts = { :command => "update", :path => path.to_s, :quiet => true }
-    
+
     begin
       SmallCage::Runner.run(opts)
-    
+
       out = docroot + "a/b/c/index.html"
       out.file?.should be_true
       out.delete
-    
+
       Dir.chdir(path) do
         opts[:path] = "."
         SmallCage::Runner.run(opts)
@@ -26,40 +27,38 @@ describe 'update' do
     ensure
       SmallCage::Runner.run({:command => "clean", :path => path.to_s, :quiet => true })
     end
-      
   end
-  
+
   it "should not publish _dir.smc and _local.smc" do
-    root = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
+    root = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs3'))
 
     opts = { :command => "update", :path => root.to_s, :quiet => true }
-    
+
     begin
       SmallCage::Runner.run(opts)
-    
+
       out = root + "_dir"
       out.file?.should be_false
-    
+
       out = root + "_local"
       out.file?.should be_false
     ensure
       SmallCage::Runner.run({:command => "clean", :path => root.to_s, :quiet => true })
     end
-    
   end
-  
+
   # http://github.com/bluemark/smallcage/issues/#issue/2
   it "should not delete files under the common prefix directory" do
-    root = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
+    root = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs3'))
     begin
       SmallCage::Runner.run({ :command => "update", :path => root.to_s, :quiet => true })
-      
+
       (root + "a/index.html").file?.should be_true
       (root + "ab/index.html").file?.should be_true
       (root + "abc/index.html").file?.should be_true
 
       SmallCage::Runner.run({ :command => "update", :path => (root + "a").to_s, :quiet => true })
-      
+
       (root + "a/index.html").file?.should be_true
       (root + "ab/index.html").file?.should be_true
       (root + "abc/index.html").file?.should be_true
@@ -72,8 +71,5 @@ describe 'update' do
     ensure
       SmallCage::Runner.run({:command => "clean", :path => root.to_s, :quiet => true })
     end
-    
   end
-
-  
 end

data/spec/{uri_spec.rb → lib/smallcage/commands/uri_spec.rb}

@@ -1,9 +1,10 @@
 require 'spec_helper.rb'
+require 'smallcage'
 require 'smallcage/commands/uri'
 
 describe SmallCage::Commands::Uri do
   it "should prints all uris" do
-    path = Pathname.new(File.dirname(__FILE__) + "/data/multifiles")
+    path = Pathname.new(File.join(SPEC_DATA_DIR, 'multifiles'))
 
     old_stdout = $stdout
     begin
@@ -26,7 +27,7 @@ EOT
   end
 
   it "should prints partial uris" do
-    path = Pathname.new(File.dirname(__FILE__) + "/data/multifiles")
+    path = Pathname.new(File.join(SPEC_DATA_DIR, 'multifiles'))
 
     old_stdout = $stdout
     begin
@@ -49,10 +50,8 @@ EOT
 
 /items/items-after-emptyline.html
 EOT
-      
     ensure
       $stdout = old_stdout
     end
   end
 end
-

data/spec/{document_path_spec.rb → lib/smallcage/document_path_spec.rb}

@@ -2,47 +2,42 @@ require 'spec_helper.rb'
 require 'smallcage'
 
 describe SmallCage::DocumentPath do
-  
-  before do
-    @rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
-    @docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir + "a/b/c/index.html.smc")
-  end
-  
+  let(:rootdir) { Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs1')) }
+  let(:docpath) { SmallCage::DocumentPath.new(rootdir, rootdir + 'a/b/c/index.html.smc') }
+
   it "should have uri property" do
-    @docpath.uri.should == "/a/b/c/index.html.smc"
+    docpath.uri.should == "/a/b/c/index.html.smc"
   end
-  
+
   it "should return smc file or not" do
-    @docpath.smc?.should be_true
+    docpath.smc?.should be_true
   end
-  
+
   it "should return output file" do
-    out = @docpath.outfile
+    out = docpath.outfile
     out.should be_an_instance_of(SmallCage::DocumentPath)
-    out.path.basename.to_s.should == "index.html"
+    out.path.basename.to_s.should == 'index.html'
     out.path.to_s.should match(%r{^/.+/a/b/c/index.html$})
-    @docpath.path.to_s[0..-5].should == out.path.to_s
+    docpath.path.to_s[0..-5].should == out.path.to_s
   end
-  
+
   it "should return output file uri" do
-    out = @docpath.outuri
+    out = docpath.outuri
     out.should == "/a/b/c/index.html"
   end
-  
+
   it "should return root uri" do
-    docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir)
+    docpath = SmallCage::DocumentPath.new(rootdir, rootdir)
     docpath.uri.should == "/"
   end
-  
+
   it "should return directory uri" do
-    docpath = SmallCage::DocumentPath.new(@rootdir, @rootdir + "a/b")
-    docpath.uri.should == "/a/b"
+    docpath = SmallCage::DocumentPath.new(rootdir, rootdir + 'a/b')
+    docpath.uri.should == '/a/b'
   end
 
   it "should raise Exception when the path doesn't exist under the root directory" do
-    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
     path    = Pathname.new(File.dirname(__FILE__))
-
     ok = false
     begin
       docpath = SmallCage::DocumentPath.new(rootdir, path)
@@ -52,10 +47,7 @@ describe SmallCage::DocumentPath do
     end
     ok.should be_true
 
-
-    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
-    path    = Pathname.new(File.dirname(__FILE__) + "/data/htdocs")
-
+    path    = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs'))
     ok = false
     begin
       docpath = SmallCage::DocumentPath.new(rootdir, path)
@@ -65,10 +57,7 @@ describe SmallCage::DocumentPath do
     end
     ok.should be_true
 
-
-    rootdir = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
-    path    = Pathname.new(File.dirname(__FILE__) + "/data/htdocs2")
-
+    path    = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs2'))
     ok = false
     begin
       docpath = SmallCage::DocumentPath.new(rootdir, path)
@@ -78,5 +67,4 @@ describe SmallCage::DocumentPath do
     end
     ok.should be_true
   end
-  
 end

data/spec/{loader_spec.rb → lib/smallcage/loader_spec.rb}

@@ -2,10 +2,9 @@ require 'spec_helper.rb'
 require 'smallcage'
 
 describe SmallCage::Loader do
-
   before do
-    @docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
-    @docroot3 = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
+    @docroot = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs1'))
+    @docroot3 = Pathname.new(File.join(SPEC_DATA_DIR, 'htdocs3'))
   end
 
   it "should load path value which is instance of Pathname" do
@@ -14,11 +13,11 @@ describe SmallCage::Loader do
 
     obj["path"].should be_an_instance_of(Pathname)
     obj["path"].smc.should be_an_instance_of(Pathname)
-    
+
     obj["path"].to_s.should =~ %r{^.+/a/b/c/index\.html$}
     obj["path"].smc.to_s.should =~ %r{^.+/a/b/c/index\.html\.smc$}
   end
-  
+
   it "should be able to omit smc extention" do
     ldr = SmallCage::Loader.new(@docroot + "a/b/c/index.html")
     objects = []
@@ -30,18 +29,18 @@ describe SmallCage::Loader do
     obj["uri"].should == "/a/b/c/index.html"
     obj["uri"].smc.should == "/a/b/c/index.html.smc"
   end
-  
+
   it "should find smc root dir" do
     path = @docroot + "a/b/c/index.html.smc"
-    
+
     depth = 5
     root = SmallCage::Loader.find_root(path, depth)
     root.to_s.should =~ %r{^.+/data/htdocs1$}
-    
+
     depth = 3
     lambda { SmallCage::Loader.find_root(path, depth) }.should raise_error
   end
-  
+
   it "should load strings" do
     path = @docroot + "a/b/c/index.html.smc"
     ldr = SmallCage::Loader.new(path)
@@ -53,14 +52,14 @@ describe SmallCage::Loader do
     end
     objects[0]["strings"][0].should == "abc\ndef\n\nghi"
   end
-  
+
   it "should load body value which equals strings[0]" do
     ldr = SmallCage::Loader.new(@docroot)
     obj = ldr.load(@docroot + "a/b/c/index.html.smc")
-    
-    obj["strings"][0].should == "abc\ndef\n\nghi"  
+
+    obj["strings"][0].should == "abc\ndef\n\nghi"
     obj["body"].should == obj["strings"][0]
-    
+
     # same String instance
     obj["strings"][0].replace("XXX")
     obj["body"].should == "XXX"
@@ -68,20 +67,20 @@ describe SmallCage::Loader do
     obj["strings"][0] = "ABC"
     obj["body"].should == "XXX"
   end
-  
+
   it "should load dirs" do
     ldr = SmallCage::Loader.new(@docroot)
     obj = ldr.load(@docroot + "a/b/c/index.html.smc")
-    
+
     dirs = obj["dirs"]
     dirs.length.should == 4
-    
+
     dirs[0]["uri"].should == "/"
     dirs[1]["uri"].should == "/a/"
     dirs[2]["uri"].should == "/a/b/"
     dirs[3]["uri"].should == "/a/b/c/"
     (dirs[3]["path"] + "index.html.smc").file?.should be_true
-    
+
     dirs[0]["var"].should == "xxx"
     dirs[0]["strings"][0].should == "BODYBODYBODY"
     dirs[0]["body"].should == "BODYBODYBODY"
@@ -107,5 +106,4 @@ describe SmallCage::Loader do
     dirs[3]["body"].should == "strings"
 
   end
-  
 end

data/spec/lib/smallcage/misc_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper.rb'
+require 'smallcage'
+
+describe 'misc' do
+  it 'returns empty string' do
+    expect(''.camelize).to eq ''
+  end
+
+  it 'camelize String' do
+    expect('smallcage'.camelize).to eq 'Smallcage'
+    expect('abc_def_ghi'.camelize).to eq 'AbcDefGhi'
+  end
+
+  it 'camelize with first character in lower case' do
+    expect('smallcage'.camelize(false)).to eq 'smallcage'
+    expect('abc_def_ghi'.camelize(false)).to eq 'abcDefGhi'
+  end
+end

data/spec/{update_list_spec.rb → lib/smallcage/update_list_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper.rb'
 require 'smallcage'
 
 describe SmallCage::UpdateList do
-  root = Pathname.new(File.dirname(__FILE__) + "/data/updatelists")
+  root = Pathname.new(File.join(SPEC_DATA_DIR, 'updatelists'))
 
   it "should create empty data" do
     list = SmallCage::UpdateList.new(root + "dummy.yml", "/")
@@ -47,14 +47,14 @@ EOT
       list = SmallCage::UpdateList.new(file, "/")
       list.update("/index.html.smc", 1234567890, "/index.html")
       list.save
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       list.mtime("/index.html.smc").should == 1234567890
-      
+
       # same dst file
       list.update("/abc/index.html.smc", 1, "/index.html")
       list.mtime("/abc/index.html.smc").should == 1
-            
+
       list.update("/abc/index.html.smc", 2, "/index.html")
       list.mtime("/abc/index.html.smc").should == 2
       list.mtime("/index.html.smc").should == 1234567890
@@ -62,10 +62,10 @@ EOT
       list = SmallCage::UpdateList.new(file, "/")
       list.mtime("/index.html.smc").should == 1234567890
       list.mtime("/abc/index.html.smc").should == -1
-      
+
       list.update("/abc/index.html.smc", 1, "/index.html")
       list.save
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       list.mtime("/index.html.smc").should == 1234567890
       list.mtime("/abc/index.html.smc").should == 1
@@ -79,25 +79,25 @@ EOT
     begin
       list = SmallCage::UpdateList.new(file, "/")
       list.update("/index.html.smc", 1, "/index.html")
-      
+
       e = list.expire
       e.length.should == 0
-      
+
       list.save
       list.update_count.should == 1
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       e = list.expire
       e.length.should == 1
       e[0].should == "/index.html"
       list.update_count.should == 0
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       list.update("/index.html.smc", 1, "/index.html")
       e = list.expire
       e.length.should == 0
       list.update_count.should == 1
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       list.update("/index.html.smc", 1, "/index.html")
       list.update("/index.html.smc", 1, "/index2.html")
@@ -110,7 +110,7 @@ EOT
       e = list.expire
       e.length.should == 2
       e.should =~ ["/index.html", "/index2.html"]
-      
+
       list = SmallCage::UpdateList.new(file, "/abc/")
       list.update("/abc/index.html.smc", 2, "/abc/index.html")
       list.update("/abc/index2.html.smc", 3, "/abc/index2.html")
@@ -124,7 +124,7 @@ EOT
       e = list.expire
       e.length.should == 1
       e[0].should == "/abc/index.html"
-      
+
       list = SmallCage::UpdateList.new(file, "/a/")
       list.update("/a/index.html.smc", 2, "/abc/a.html")
       e = list.expire
@@ -139,13 +139,13 @@ EOT
       e.length.should == 0
       list.update_count.should == 2
       list.save
-      
+
       list = SmallCage::UpdateList.new(file, "/a/")
       list.update("/a/index.html.smc", 2, "/abc/b.html")
       e = list.expire
       e.length.should == 1
       e[0] == "/abc/a.html"
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       e = list.expire
       e.length.should == 5
@@ -155,14 +155,13 @@ EOT
       e.should include("/abc/index2.html")
       e.should include("/abc/a.html")
       list.save
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       e = list.expire
       e.length.should == 0
     ensure
       file.delete
     end
-    
   end
 
   it "should support single file target" do
@@ -203,7 +202,6 @@ EOT
     end
   end
 
-
   it "should not expire file which other source published" do
     file = root + "list-switch.yml"
     begin
@@ -213,11 +211,11 @@ EOT
       e = list.expire
       e.length.should == 0
       list.save
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       e = list.expire
       e.length.should == 2
-      
+
       list = SmallCage::UpdateList.new(file, "/")
       list.update("/other/file/1.smc", 2, "/aaa")
       list.update("/other-file-2.smc", 2, "/bbb")
@@ -227,5 +225,4 @@ EOT
       file.delete
     end
   end
-
 end