sprig 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09e094cca99e32c1042adb111565a9f79f321f2
-  data.tar.gz: 056a2e3a6ac418608dbbbd99dd905f36b8d0b39b
+  metadata.gz: a11f717b26ca547b63e3a10d77e90e5fb0b34f99
+  data.tar.gz: 875a60cf93f12dda5e3cf04f17dca18c1201f53c
 SHA512:
-  metadata.gz: 694d572f95471fde7c7141d97c5e4cd86826791a61e6cd833fd5c54094cb63273ca7d157756c248de35e5b2b5fb35891a4b6bc9064749867a72cdb6c98115879
-  data.tar.gz: 3c3bd1e7530e21baec6cf9b616d271a05aa4ce1fbd2263d5404229121d391778f745113cb4293d8da6bcf2c3a67429b8ba44f9b303329d4d386008fb42bf4154
+  metadata.gz: 3c5b80e9fbc98aeca33b2f535336a4ac577f4837ecc88b5315351f5cef5582bf67b6fad52a4af4b706c045bdb3120461c1c74b5e118eb177406f66a824e5cf99
+  data.tar.gz: 7660d42b5f0ca71849c63de2abaef6cc4ad324ee08598b00676b4196c80050eeb49264589258e601504ad5bac97514edfe42d5ec0624dbdb87193a903d0db875

data/lib/sprig/seed/attribute.rb

@@ -9,46 +9,75 @@ module Sprig
       end
 
       def dependencies
-        @dependencies ||= determine_dependencies.uniq
+        @dependencies ||= find_dependencies_within(raw_value).uniq
       end
 
       def value
-        compute_value if @value.nil?
+        @value = compute_value(raw_value) if @value.nil?
 
         @value
       end
 
       private
 
-      def determine_dependencies
-        if computed_value?
-          matches = raw_value.scan(/(sprig_record\(([A-Z][^,]*), ([\d]*)\))+/)
-          matches.map {|match| Dependency.for(match[1], match[2]) }
+      def find_dependencies_within(value)
+        if array?(value)
+          find_dependencies_within_array(value)
+        elsif string?(value) && computed_value?(value)
+          find_dependencies_within_string(value)
         else
           []
         end
       end
 
-      def string?
-        raw_value.is_a?(String)
+      def find_dependencies_within_array(array)
+        array.flat_map do |value|
+          find_dependencies_within(value)
+        end
+      end
+
+      def find_dependencies_within_string(string)
+        matches = string.scan(/(sprig_record\(([A-Z][^,]*), ([\d]*)\))+/)
+        matches.map { |match| Dependency.for(match[1], match[2]) }
+      end
+
+      def string?(value)
+        value.is_a?(String)
+      end
+
+      def array?(value)
+        value.is_a?(Array)
       end
 
-      def computed_value?
-        string? && raw_value =~ computed_value_regex
+      def computed_value?(value)
+        String(value) =~ computed_value_regex
       end
 
       def computed_value_regex
         /<%[=]?(.*)%>/
       end
 
-      def compute_value
-        @value = if computed_value?
-          matches = computed_value_regex.match(raw_value)
-          eval(matches[1])
+      def compute_value(value)
+        if array?(value)
+          compute_array_value(value)
+        elsif string?(value) && computed_value?(value)
+          compute_string_value(value)
         else
-          raw_value
+          value
         end
       end
+
+      def compute_array_value(array)
+        array.map do |value|
+          compute_value(value)
+        end
+      end
+
+      def compute_string_value(string)
+        matches = computed_value_regex.match(string)
+        eval(matches[1])
+      end
+
     end
   end
 end

data/lib/sprig/version.rb

@@ -1,3 +1,3 @@
 module Sprig
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/fixtures/models/post.rb

@@ -1,5 +1,7 @@
 class Post < ActiveRecord::Base
 
+  has_and_belongs_to_many :tags
+
   def photo=(file)
     write_attribute(:photo, File.basename(file.path))
   end

data/spec/fixtures/models/tag.rb

@@ -0,0 +1,3 @@
+class Tag < ActiveRecord::Base
+  validates :name, :presence => true
+end

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

@@ -0,0 +1,7 @@
+records:
+  - sprig_id: 1
+    title: 'Yaml title'
+    content: 'Yaml content'
+    tag_ids:
+      - '<%= sprig_record(Tag, 1).id %>'
+      - '<%= sprig_record(Tag, 2).id %>'

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

@@ -0,0 +1,5 @@
+records:
+  - sprig_id: 1
+    name: 'Botany'
+  - sprig_id: 2
+    name: 'Biology'

data/spec/spec_helper.rb

@@ -58,6 +58,12 @@ Post.connection.execute "CREATE TABLE posts (id INTEGER PRIMARY KEY AUTOINCREMEN
 Comment.connection.execute "DROP TABLE IF EXISTS comments;"
 Comment.connection.execute "CREATE TABLE comments (id INTEGER PRIMARY KEY , post_id INTEGER, body VARCHAR(255));"
 
+Tag.connection.execute "DROP TABLE IF EXISTS tags;"
+Tag.connection.execute "CREATE TABLE tags (id INTEGER PRIMARY KEY , name VARCHAR(255));"
+
+Tag.connection.execute "DROP TABLE IF EXISTS posts_tags;"
+Tag.connection.execute "CREATE TABLE posts_tags (id INTEGER PRIMARY KEY , post_id INTEGER, tag_id INTEGER);"
+
 # Helpers
 #
 # Setup fake `Rails.root`

data/spec/sprig_spec.rb

@@ -235,6 +235,24 @@ describe "Seeding an application" do
     end
   end
 
+  context "with has_and_belongs_to_many relationships" do
+    around do |example|
+      load_seeds('posts_with_habtm.yml', 'tags.yml', &example)
+    end
+
+    it "saves the habtm relationships" do
+      sprig [
+        Tag,
+        {
+          :class  => Post,
+          :source => open('spec/fixtures/seeds/test/posts_with_habtm.yml')
+        }
+      ]
+
+      Post.first.tags.map(&:name).should == ['Botany', 'Biology']
+    end
+  end
+
   context "with cyclic dependencies" do
     around do |example|
       load_seeds('comments.yml', 'posts_with_cyclic_dependencies.yml', &example)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprig
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Lawson Kurtz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,6 +201,7 @@ files:
 - spec/fixtures/config/environments/test.rb
 - spec/fixtures/models/comment.rb
 - spec/fixtures/models/post.rb
+- spec/fixtures/models/tag.rb
 - spec/fixtures/models/user.rb
 - spec/fixtures/seeds/staging/posts.yml
 - spec/fixtures/seeds/test/comments.yml
@@ -219,6 +220,8 @@ files:
 - spec/fixtures/seeds/test/posts_missing_record.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
+- spec/fixtures/seeds/test/tags.yml
 - spec/lib/generators/sprig/install_generator_spec.rb
 - spec/lib/sprig/configuration_spec.rb
 - spec/lib/sprig/directive_list_spec.rb
@@ -268,6 +271,7 @@ test_files:
 - spec/fixtures/config/environments/test.rb
 - spec/fixtures/models/comment.rb
 - spec/fixtures/models/post.rb
+- spec/fixtures/models/tag.rb
 - spec/fixtures/models/user.rb
 - spec/fixtures/seeds/staging/posts.yml
 - spec/fixtures/seeds/test/comments.yml
@@ -286,6 +290,8 @@ test_files:
 - spec/fixtures/seeds/test/posts_missing_record.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
+- spec/fixtures/seeds/test/tags.yml
 - spec/lib/generators/sprig/install_generator_spec.rb
 - spec/lib/sprig/configuration_spec.rb
 - spec/lib/sprig/directive_list_spec.rb