scheherazade 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d624c9331ac258bae8c1cad405214505c3295cc3
+  data.tar.gz: d2c0f723ce6c5bf83bd92eacbb8623edc880bf23
+SHA512:
+  metadata.gz: caa91c5084c99072d4c8cc0ecf6cdbec4a980d36767979ff3481f73a7585b6e6176d09fcbcaf037669e9eda9ba7a394ecf64e967f7b38175d71960a8a9ff6867
+  data.tar.gz: 3e46fff4918ed4eb9a77c58be70bcbf54025113be08a085806a4852a2c73000caa941278e8fbeab48245fed4e9b193048bfe0deb8d66040718babe27256e5731

data/README.md

@@ -1,4 +1,4 @@
-# Scheherazade
+# Scheherazade [![Build Status](https://travis-ci.org/marcandre/backports.png?branch=master)](https://travis-ci.org/marcandre/scheherazade) [![Gem Version](https://badge.fury.io/rb/scheherazade.svg)](http://badge.fury.io/rb/scheherazade)
 
 With Sheherazade's imagination and storytelling skills, fixtures can be as entertaining as the "Arabian Nights".
 
@@ -24,8 +24,8 @@ Scheherazade
                               # with a default name,
                               # associated to a new Company
     story.imagine(Department) # creates another Department
-                            # with another name
-                            # and associated to the same Company
+                              # with another name
+                              # and associated to the same Company
 
 ## Features
 

data/Rakefile

@@ -25,14 +25,8 @@ end
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/lib/scheherazade/bare.rb

@@ -1,3 +1,3 @@
-%w[log story character_builder extension].each do |lib|
+%w[current_hash log story character_builder extension].each do |lib|
   require_relative lib
 end

data/lib/scheherazade/character_builder.rb

@@ -94,7 +94,7 @@ module Scheherazade
       when :has_one
         ar
       when :has_many
-        if ar && ar.persisted?
+        if ar.respond_to?(:persisted?) && ar.persisted?
           if ar.send(assoc.active_record.name.underscore) != @ar
             log :additional_character, assoc.name
             [self.class.new(associated_character).build(opts)]

data/lib/scheherazade/current_hash.rb

@@ -0,0 +1,55 @@
+module Scheherazade
+
+  # A subclass of Hash, with automatic lookup up
+  # the story chain and ability to restore the characters
+  #
+  class CurrentHash < Hash
+    def initialize(story)
+      @restore = []
+      super() do |h, k|
+        if (char = story.to_character!(k))
+          h[char]
+        else
+          if up = story.parent
+            h[k] = remember(up.current[k])
+          end
+        end
+      end
+    end
+
+    # restore all characters borrowed to parent stories
+    # to their original state.
+    #
+    def restore
+      @restore.each_slice(3) do |obj, instance_variable_names, values|
+        instance_variable_names.zip(values) do |iv, val|
+          obj.instance_variable_set(iv, val)
+        end
+      end
+      self
+    end
+
+    protected
+
+    # Implementation note: the reason why we remember the object
+    # and then reset it, instead of attempting to clone it is
+    # that active record doesn't implement a meaningful clone
+    # and dup creates a different object altogether.
+    #
+    # Attempting to clone an AR object, including it's loaded relations
+    # would require playing too close to the metal and would be too brittle
+    #
+    def remember(object)
+      return object unless object
+      ivs = object.instance_variables
+      @restore << object << ivs << ivs.map do |iv|
+        v = object.instance_variable_get(iv)
+        v = v.clone if v.duplicable?
+        v
+      end
+      object
+    end
+
+  end
+
+end

data/lib/scheherazade/story.rb

@@ -1,6 +1,9 @@
 module Scheherazade
+  class RedefinitionError < Exception
+  end
+
   class Story < Hash
-    attr_reader :fill_attributes, :characters, :counter, :current
+    attr_reader :fill_attributes, :characters, :counter, :current, :parent
 
     module ClassMethods
       def current
@@ -19,7 +22,7 @@ module Scheherazade
       # to the previous current story
       #
       def end(opts = nil)
-        current.send :rollback if opts && opts[:rollback]
+        current.send :rollback, opts && opts[:rollback]
         Thread.current[:scheherazade_stories].pop
         current
       end
@@ -59,13 +62,7 @@ module Scheherazade
     def initialize(parent = self.class.current)
       super(){|h, k| parent[k] if parent }
       @parent = parent
-      @current = Hash.new do |h, k|
-        if (char = to_character!(k))
-          h[char]
-        else
-          parent.current[k] if parent
-        end
-      end
+      @current = CurrentHash.new(self)
       @fill_attributes = Hash.new{|h, k| parent.fill_attributes[k] if parent }
       @characters = Hash.new {|h, k| parent.characters[k] if parent }
       @counter = parent ? parent.counter.dup : Hash.new(0)
@@ -145,6 +142,7 @@ module Scheherazade
 
     def fill(character_or_model, *with)
       char = to_character(character_or_model)
+      raise RedefinitionError, "#{char} already defined for this story" if fill_attributes.has_key? char
       fill_attributes[char] = with
       @characters[char] = current_fill unless to_model(char)
       begin
@@ -177,8 +175,9 @@ module Scheherazade
       end
     end
 
-    def rollback
-      @built.each(&:destroy)
+    def rollback(hard)
+      current.restore
+      @built.each(&:destroy) if hard
     end
 
     def building(ar)

data/lib/scheherazade/version.rb

@@ -1,3 +1,3 @@
 module Scheherazade
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: scheherazade
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Marc-André Lafortune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: With Sheherazade's imagination and storytelling skills, fixtures can
@@ -67,44 +60,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/scheherazade.rb
 - lib/scheherazade/bare.rb
 - lib/scheherazade/character_builder.rb
+- lib/scheherazade/current_hash.rb
 - lib/scheherazade/extension.rb
 - lib/scheherazade/log.rb
 - lib/scheherazade/story.rb
 - lib/scheherazade/version.rb
-- lib/scheherazade.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: http://github.com/marcandre/scheherazade
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -946841948511242031
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -946841948511242031
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Entertaining fixtures for Rails
 test_files: []