cakery 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84a3bb4b2627490d205e70102ab4a11a11b2d6c
-  data.tar.gz: 9e73535a703ee70c6154e405b2b8d3f13be2b446
+  metadata.gz: a5f2fd85093c1a2c603484a085d84a4d6cd437aa
+  data.tar.gz: 2b20adf0352b472af21526c5b3b26a9178a9fea4
 SHA512:
-  metadata.gz: a0ede44436c29a6afa4698a5ec0fcca588b83f87477fa00e946af55ab6fd5838d4f8a35e823c7c36272933872c7944e410db882082b82b9a61517cf223172e1d
-  data.tar.gz: fe07bb06a9853d5a5856e46773a836b45b9ec5be33cb68129d9e7b1a650788173b0e9224613a2abdb2c7c54a78d0764cb770f7068f4cf5b31cf173b86ba90e5a
+  metadata.gz: 050f3a305833d10fe29ad2035a7b3841f9b4f102baa93f79bddbe63fc232eed2322f2f4b5b665f97ab5b4e3f6e85744de2dbc8f8b25342473ecf6e336d62032b
+  data.tar.gz: 8f4578d6be1061b15d0b94998e37477aa49a1b75dca9d03e7ca1166f81a47db2fff49f39d92a3424aecdd5c6dbf65882c1f148d7e1d53e0583617f19de1a1dd9

data/lib/cakery.rb

@@ -28,12 +28,12 @@ module Cakery
     end
 
     def method_missing name, *args, &block
-      if name =~ /=/
-        name = ('@'+name.to_s.gsub(/=/, "")).to_sym
-        self.instance_variable_set(name, args.first)
-      else
+      #if name =~ /=/
+        #name = ('@'+name.to_s.gsub(/=/, "")).to_sym
+        #self.instance_variable_set(name, args.first)
+      #else
         return CakeERBContextTwoClauseHelper.new(self, name)
-      end
+      #end
     end
 
     def get_binding
@@ -50,6 +50,31 @@ module Cakery
       @macros = []
     end
 
+    def <(e)
+      vname = ('@'+@name.to_s.gsub(/=/, "")).to_sym
+      out = ""
+
+      #Append all files or it's a macro class
+      if e.class == String
+        out = e
+
+        #Run through each macro and run it in the reverse
+        #order that we put it in so that
+        #r.var << MyMacroA << MyMacroB << "./directory" will execute first MyMacroB and then MyMacroA
+        while macro = @macros.pop
+          out = macro.new.process(out)
+        end
+
+        @erb_context.instance_variable_set(vname, "") unless @erb_context.instance_variable_defined?(vname)
+        v = @erb_context.instance_variable_get(vname)
+        out = "\n" + out unless v == ""
+        v += out
+        @erb_context.instance_variable_set(vname, v)
+      else
+        raise "< operator needs a string, you passed #{e.inspect}"
+      end
+    end
+
     def <<(e)
       vname = ('@'+@name.to_s.gsub(/=/, "")).to_sym
       out = ""
@@ -72,7 +97,6 @@ module Cakery
         v = @erb_context.instance_variable_get(vname)
         v += out
         @erb_context.instance_variable_set(vname, v)
-
       else
         #Assume it's a macro, save it onto the stack
         @macros << e

data/lib/cakery/version.rb

@@ -1,3 +1,3 @@
 module Cakery
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/bake_spec.rb

@@ -28,14 +28,13 @@ RSpec.describe "Baking" do
     secret = SecureRandom.hex
 
     c = Cakery.new(cp) do |r|
-      r.secret = secret
+      r.secret < secret
     end
 
     c.bake
     expect(c.src).to eq("#{secret}\n")
   end
 
-
   it "can use a directory append" do
     cp = cakery_path "test2"
 
@@ -106,6 +105,38 @@ RSpec.describe "Baking" do
     expect(c.src).to eq("goodbye world 1\ngoodbye world 2\n\n")
   end
 
+  it "supports macros via <" do
+    cp = cakery_path "test4"
+
+    class MyMacro < Cakery::Macro
+      def process str
+        out = ""
+        str.split("\n").each do |line|
+          if line =~ /hello/
+            out += line.gsub(/hello/, "goodbye")
+          else
+            out += line
+          end
+
+          out += "\n"
+        end
+        out
+      end
+    end
+
+    c = Cakery.new(cp) do |r|
+      r.secret << MyMacro < "hello world 1\ngoodbye world 2\n"
+    end
+
+    cd_proj "test4" do
+      c.bake
+    end
+
+    #Started out with hello world 1, goodbye world 2 -> goodbye world 1, goodbye world 2
+    expect(c.src).to eq("goodbye world 1\ngoodbye world 2\n\n")
+  end
+
+
   #it "supports stacked macros" do
     #cp = cakery_path "test4"
 
@@ -139,17 +170,65 @@ RSpec.describe "Baking" do
     #expect(c.src).to eq("fuck_you world 1\nfuck_you world 2\n\n")
   #end
 
-  #it "supports two dir sources to one variable" do
-    #cp = cakery_path "test5"
+  it "supports stacked macros" do
+    cp = cakery_path "test4"
 
-    #c = Cakery.new(cp) do |r|
-      #r.secret << "./secret1/*"
-      #r.secret << "./secret2/*"
-    #end
+    class MyMacro < Cakery::Macro
+      def process str
+        out = ""
+        str.split("\n").each do |line|
+          if line =~ /hello/
+            out += line.gsub(/hello/, "goodbye")
+          elsif line =~ /goodbye/
+            out += line.gsub(/goodbye/, "fuck_you")
+          else
+            out += line
+          end
+
+          out += "\n"
+        end
+        out
+      end
+    end
+
+    c = Cakery.new(cp) do |r|
+      r.secret << MyMacro << MyMacro < "hello world 1\ngoodbye world 2\n\n"
+    end
+
+    cd_proj "test4" do
+      c.bake
+    end
+
+    #Started out with hello world 1, goodbye world 2 -> goodbye world 1, goodbye world 2
+    expect(c.src).to eq("fuck_you world 1\nfuck_you world 2\n\n")
+  end
+
+  it "supports two dir sources to one variable" do
+    cp = cakery_path "test5"
+
+    c = Cakery.new(cp) do |r|
+      r.secret << "./secret1/*"
+      r.secret << "./secret2/*"
+    end
+
+    cd_proj "test5" do
+      c.bake
+    end
+    expect(c.src).to eq("hello world\ngoodbye world\n\n")
+  end
+
+  it "supports two string sources to one variable" do
+    cp = cakery_path "test5"
+
+    c = Cakery.new(cp) do |r|
+      r.secret < "hello"
+      r.secret < "world"
+    end
+
+    cd_proj "test5" do
+      c.bake
+    end
+    expect(c.src).to eq("hello\nworld\n")
+  end
 
-    #cd_proj "test5" do
-      #c.bake
-    #end
-    #expect(c.src).to eq("hello world\ngoodbye world\n\n")
-  #end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cakery
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - seo