sprig 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2500ec348b79679f29e89f4109b33ee91f11fd
-  data.tar.gz: c6248310b5089e1d03778caeb1d7e09a9e7d4c74
+  metadata.gz: d8c76050cd88f10b7aa5734b205c1bdc5afbc5ea
+  data.tar.gz: ffeebeb96d52c7fa0cd0ba39c9c0fdf0d337c247
 SHA512:
-  metadata.gz: d95948af8e4146673d3152e4e8e0a9de1e554641d86d404998dd2c794fc8aeb7f8cd73af9f68eabf115459e0cca08ebcaa5245dd461ac98f00e2010b9ef56822
-  data.tar.gz: f63975d16165e30e95fa7e72a5ee3fa0ab68c6e69b7b4d56507d49ee6f5ea3454de4bc8c5d480b5598e713e75f689c5f4b4d4f5737170e0f3effab6a360f84f0
+  metadata.gz: a35c299bee763d65c441323002da0b3f74405a2ecd9a831bfa5e108c033b3a3c129f151649e878293ea3f27d060265030054ec65ee0e252411fb86cffb3a6bb7
+  data.tar.gz: 99024ba29c6b31096a3a18332b31e1ba1594d062009cdba4731c592d39edc64b5bb4a1ceeff2632dbb2fd3bdf9d28b1adc9dc14912073b696cb5c89961a22a4d

data/lib/sprig/seed/attribute.rb

@@ -54,7 +54,7 @@ module Sprig
       end
 
       def computed_value_regex
-        /<%[=]?(.*)%>/
+        /(<%=?(.*?)%>)/
       end
 
       def compute_value(value)
@@ -73,9 +73,33 @@ module Sprig
         end
       end
 
+      def completely_dynamic_value?(string, matches)
+        return false if matches.count > 1
+
+        test_string = string.clone
+
+        matches.each do |match|
+          test_string = test_string.sub(match[0], "")
+        end
+
+        test_string.strip.length == 0
+      end
+
       def compute_string_value(string)
-        matches = computed_value_regex.match(string)
-        eval(matches[1])
+        matches = string.scan(computed_value_regex)
+
+        if completely_dynamic_value?(string, matches)
+          # If the dynamic portion is the entire value, return the result of the eval
+          # (This allows for the return of non-string types.)
+          eval(matches.first[1])
+        else
+          # Otherwise return the dynamic portion within the larger string.
+          string.clone.tap do |return_string|
+            matches.each do |match|
+              return_string.sub!(match[0], eval(match[1]))
+            end
+          end
+        end
       end
 
     end

data/lib/sprig/version.rb

@@ -1,3 +1,3 @@
 module Sprig
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/spec/fixtures/seeds/test/posts_partially_dynamic_value.yml

@@ -0,0 +1,4 @@
+records:
+  - sprig_id: 1
+    title: '<%= "Partially" %> <%= "Dynamic" %> Title'
+    content: 'Yaml content'

data/spec/sprig_spec.rb

@@ -53,6 +53,24 @@ describe "Seeding an application" do
     end
   end
 
+  context "with a partially-dynamic value" do
+    around do |example|
+      load_seeds('posts_partially_dynamic_value.yml', &example)
+    end
+
+    it "seeds the db with the full value" do
+      sprig [
+        {
+          :class  => Post,
+          :source => open('spec/fixtures/seeds/test/posts_partially_dynamic_value.yml')
+        }
+      ]
+
+      Post.count.should == 1
+      Post.pluck(:title).should =~ ['Partially Dynamic Title']
+    end
+  end
+
   context "with a symlinked file" do
     let(:env) { Rails.env }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprig
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Lawson Kurtz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -259,6 +259,7 @@ files:
 - spec/fixtures/seeds/test/posts_find_existing_by_single.yml
 - spec/fixtures/seeds/test/posts_missing_dependency.yml
 - spec/fixtures/seeds/test/posts_missing_record.yml
+- spec/fixtures/seeds/test/posts_partially_dynamic_value.yml
 - spec/fixtures/seeds/test/posts_with_cyclic_dependencies.yml
 - spec/fixtures/seeds/test/posts_with_files.yml
 - spec/fixtures/seeds/test/posts_with_habtm.yml
@@ -336,6 +337,7 @@ test_files:
 - spec/fixtures/seeds/test/posts_find_existing_by_single.yml
 - spec/fixtures/seeds/test/posts_missing_dependency.yml
 - spec/fixtures/seeds/test/posts_missing_record.yml
+- spec/fixtures/seeds/test/posts_partially_dynamic_value.yml
 - spec/fixtures/seeds/test/posts_with_cyclic_dependencies.yml
 - spec/fixtures/seeds/test/posts_with_files.yml
 - spec/fixtures/seeds/test/posts_with_habtm.yml