maliq 0.0.4 → 0.0.5

data/lib/maliq/file_utils.rb

@@ -1,6 +1,8 @@
+require "enumerator"
+
 module Maliq
   module FileUtils
-    SPLIT_MARKER = /^<<<---\s*([\w\.]+?)\s*--->>>\n/
+    SPLIT_MARKER = /^<<<---(.*)--->>>\n/
 
     # Retrieve Yaml Front Matter from text.
     # Returns [yfm, text]
@@ -13,16 +15,28 @@ module Maliq
       return yfm, text
     end
 
+    # Split a file with SPLIT_MARKER.
+    # Returns a Hash of filename key with its content.
     def split(path, marker=nil)
       marker ||= SPLIT_MARKER
       content = File.read(path)
       filename = File.basename(path, '.*')
       yfm, content = retrieveYFM(content)
-      contents = ([filename] + content.split(marker)).to_hash
-      contents.with({}) { |(fname, text), h| h[fname] = yfm + text }
+      contents = [filename] + content.split(marker)
+      prev_name = filename
+      contents.each_slice(2).with({}) do |(fname, text), h|
+        fname = prev_name = create_filename(prev_name) if fname.strip.empty?
+        h[fname.strip] = yfm + text
+      end
     end    
 
-    module_function :split, :retrieveYFM
+    # create filename from previous filename with sequence number.
+    def create_filename(prev_name)
+      prev_name[/\d+$/] ? prev_name.next : prev_name + '02'
+    end
+    private :create_filename
+
+    module_function :split, :retrieveYFM, :create_filename
   end
 end
 

data/lib/maliq/system_extensions.rb

@@ -25,10 +25,4 @@ class Hash
   end
 end
 
-class Array
-  def to_hash
-    Hash[ *self ]
-  end
-end
-
 Enumerable.send(:alias_method, :with, :each_with_object)

data/lib/maliq/version.rb

@@ -1,3 +1,3 @@
 module Maliq
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/file_utils_spec.rb

@@ -99,5 +99,69 @@ describe Maliq::FileUtils do
 
       it { @f.should == {'tmp' => @ch1, 'chapter02' => @ch2, 'chapter03' => @ch3} }
     end
+
+    context "with chapters but no name" do
+      before do
+        Dir.mktmpdir do |dir|
+          tmpf = "#{dir}/tmp"
+          @content = ~<<-EOF
+            #hello
+            hello
+            <<<------>>>
+            #Goodbye
+            goodbye
+            <<<--- chapter03 --->>>
+            #Yo
+            yoyoyo
+            EOF
+          @ch1, @ch2, @ch3 = ~<<-F1, ~<<-F2, ~<<-F3
+            #hello
+            hello
+            F1
+            #Goodbye
+            goodbye
+            F2
+            #Yo
+            yoyoyo
+            F3
+          File.write(tmpf, @content)
+          @f = split(tmpf)
+        end
+      end
+
+      it { @f.should == {'tmp' => @ch1, 'tmp02' => @ch2, 'chapter03' => @ch3} }
+    end
+
+    context "with chapters but no name 2" do
+      before do
+        Dir.mktmpdir do |dir|
+          tmpf = "#{dir}/chapter1"
+          @content = ~<<-EOF
+            #hello
+            hello
+            <<<------>>>
+            #Goodbye
+            goodbye
+            <<<--- --->>>
+            #Yo
+            yoyoyo
+            EOF
+          @ch1, @ch2, @ch3 = ~<<-F1, ~<<-F2, ~<<-F3
+            #hello
+            hello
+            F1
+            #Goodbye
+            goodbye
+            F2
+            #Yo
+            yoyoyo
+            F3
+          File.write(tmpf, @content)
+          @f = split(tmpf)
+        end
+      end
+
+      it { @f.should == {'chapter1' => @ch1, 'chapter2' => @ch2, 'chapter3' => @ch3} }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maliq
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: