bread_calculator 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cbd43078e0f6a01f011391dd6648963c936f016
-  data.tar.gz: daaaeedbe36c23d8f3b8da79ec6b2336f6c5440a
+  metadata.gz: 666fabbb1e5c7ca277e727d4c3e90cce94fbc0d2
+  data.tar.gz: 70432c965d212256fadb9e6be72d65edfae30301
 SHA512:
-  metadata.gz: c6759ec269ed7e0c74acac7002d43509b112945efe4cc8fc3747c0f6319fa95620bea54ba1d88d7b382a8778eca7038d04d31df933af6ec643e64e985d0d4bf6
-  data.tar.gz: 02c65e0cc83274355b70edcea3eb47cc501b7e0b0c3a99acc37f213e88e8873a03f477c102f855b77d11a9a0e7bc0fc76eea753450fe0b6063f04ed4bcdab84b
+  metadata.gz: a6438357680a4f803b3e69f0455edc5e73f3ea404cb98629f1c4ec01ad4b8d42f23d96066754f6b6e88df531e2d69b8f3cc5be4f4583ee1f08d021c820a93181
+  data.tar.gz: 2f5885744e28b1e3f46ff0e0e9fad1fc5a3606553fda3565a37be29ceeb00e172cb08054c5f854879f599a8a505e439fdbe7d3e1138a26cfdc97ca162d27a1c9

data/bin/bread-calc

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bread_calculator'
-
-@get = 'r'
-@help = nil
+#require  "#{File.dirname(__FILE__)}/../lib/bread_calculator"
 
 def help status=true
   puts <<EOF
@@ -26,8 +24,14 @@ OPTIONS:
   --scale-by FACTOR
     regenerate the recipe, scaling up or down by FACTOR
 FORMATS
-  The recipe format starts with a free-form prelude. Any line starting with a
-  hyphen ends the prelude and starts the first step. 
+  The recipe format consists of a metadata prelude, and steps.
+
+  In prelude lines, anything before a colon is considered to be the name of a
+  metadata field; anything after the colon is a value to populate. Lines
+  without colons are continuations of the 'notes' field. It is suggested to 
+  have at least a 'name' field.
+  
+  A line starting with a hyphen ends the prelude and starts the first step. 
 
   Each step is delimited by one or more blank lines.
 
@@ -44,10 +48,13 @@ BUGS
   anything good.
 EOF
   
-exit status
+  exit status
 
 end
 
+@get = 'r'
+@help = nil
+
 loop { case ARGV[0]
   when /--help/     then             @help = 'help'     ;  ARGV.shift; break
   when /--summary/  then             @get  = 'r.summary';  ARGV.shift
@@ -61,7 +68,7 @@ end; }
 help if @help
 
 ARGV.each do |arg|
-  parser = BreadCalculator::Parser.new arg
+  parser = BreadCalculator::Parser.new
   r = parser.parse(arg)
   puts eval("#{@get}")
 end

data/bread_calculator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'bread_calculator'
-  s.version     = '0.0.2'
+  s.version     = '0.1.0'
   s.date        = '2014-03-07'
   s.summary     = "calculate baker's percentages"
   s.description = "a gem and command-line wrapper to generate baker's

data/lib/bread_calculator.rb

@@ -207,15 +207,14 @@ module BreadCalculator
     ##
     # Create a new parser for Recipe +name+.
     
-    def initialize name
-      @name = name
-
+    def initialize
       @i = 0
       @args = @steps = []
       @steps[0] = BreadCalculator::Step.new
 
       @in_prelude = true
       @prelude = ''
+      @metadata = Hash.new(nil)
     end
 
     ##
@@ -224,21 +223,16 @@ module BreadCalculator
     def parse input
 
       IO.foreach(input) do |line|
-        new_step         && next if line =~ /(^-)|(^\s*$)/
-        @prelude << line && next if @in_prelude
+        new_step              && next if line =~ /(^-)|(^\s*$)/
+        preprocess_meta(line) && next if @in_prelude
 
-        @args << preprocess(line.chomp)
+        @args << preprocess_step(line.chomp)
       end   
 
       close_step
       # because we made a spurious one to begin with
       @steps.shift
-      metadata = {
-        :name  => @name,
-        :notes => @prelude,
-      }
-
-      Recipe.new metadata, @steps
+      Recipe.new @metadata, @steps
     end
 
     private
@@ -256,7 +250,19 @@ module BreadCalculator
       @steps[@i].techniques = @args
     end
 
-    def preprocess line
+    def preprocess_meta line
+      /^((?<key>[^:]+):)?(?<value>.*)/ =~ line
+      match = Regexp.last_match
+      key = match[:key] ? match[:key].strip.to_sym : :notes
+      if @metadata[key]
+        @metadata[key] << "\n\t"
+      else
+        @metadata[key] = ''
+      end
+      @metadata[key] << match[:value].strip
+    end
+
+    def preprocess_step line
       ing_regex = /^\s+((?<qty>[0-9.]+\s*)(?<units>g)?\s+)?(?<item>.*)/
       h = Hash.new
       if ing_regex =~ line 

data/spec/bread_calculator_spec.rb

@@ -45,8 +45,7 @@ describe BreadCalculator do
     end
 
     it 'pretty prints' do
-      pending
-      @recipe.to_s.is_a?(String).should be_true
+      @recipe.to_s.match(/\n-+\n/).should be_true
     end
 
     it 'generates a baker\'s percentage summary' do
@@ -68,7 +67,7 @@ describe BreadCalculator do
   describe BreadCalculator::Parser do
     before do
       @sample = "#{File.dirname(__FILE__)}/../sample/sandwich-bread.recipe"
-      @parser = BreadCalculator::Parser.new 'Sandwich Bread'
+      @parser = BreadCalculator::Parser.new 
       @r = @parser.parse "#{@sample}"
     end
 
@@ -80,6 +79,11 @@ describe BreadCalculator do
       pending
     end
 
+    it 'generates metadata' do
+      #@r.metadata[:notes].is_a?(String).should be_true
+      @r.metadata[:notes].length.should == 86
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bread_calculator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Noah Birnel