scheherazade 0.0.4 → 0.0.5

data/lib/scheherazade/character_builder.rb

@@ -8,7 +8,7 @@ module Scheherazade
       while (c = story.characters[@chain.first])
         @chain.unshift c
       end
-      @model = @chain.first
+      @model = Story.to_model(@chain.first)
       story.send(:building) << @ar = @model.new
       @chain.each{|c| story.current[c] = @ar }
     end

data/lib/scheherazade/story.rb

@@ -2,47 +2,72 @@ module Scheherazade
   class Story < Hash
     attr_reader :fill_attributes, :characters, :counter, :current
 
-    def self.current
-      (Thread.current[:scheherazade_stories] ||= []).last || TOP
-    end
+    module ClassMethods
+      def current
+        (Thread.current[:scheherazade_stories] ||= []).last || TOP
+      end
 
-    # Begins a story within the current story.
-    # Should be balanced with a call to +end+
-    #
-    def self.begin
-      (Thread.current[:scheherazade_stories] ||= []).push Story.new
-      current
-    end
+      # Begins a story within the current story.
+      # Should be balanced with a call to +end+
+      #
+      def begin
+        (Thread.current[:scheherazade_stories] ||= []).push Story.new
+        current
+      end
 
-    # Ends the current substory and comes back
-    # to the previous current story
-    #
-    def self.end(opts = nil)
-      current.send :rollback if opts && opts[:rollback]
-      Thread.current[:scheherazade_stories].pop
-      current
-    end
+      # Ends the current substory and comes back
+      # to the previous current story
+      #
+      def end(opts = nil)
+        current.send :rollback if opts && opts[:rollback]
+        Thread.current[:scheherazade_stories].pop
+        current
+      end
 
-    # Begins a substory, yields, and ends the story
-    #
-    def self.tell(opts = nil)
-      yield self.begin
-    ensure
-      self.end(opts)
+      # Begins a substory, yields, and ends the story
+      #
+      def tell(opts = nil)
+        yield self.begin
+      ensure
+        self.end(opts)
+      end
+
+      def to_character(character_or_model)
+        case character_or_model
+        when Class
+          character_or_model.name.underscore.to_sym
+        when Symbol
+          character_or_model
+        else
+          raise ArgumentError, "expected character or Model, got #{character_or_model.ancestors}"
+        end
+      end
+
+      def to_character!(character_or_model)
+        to_character(character_or_model) unless character_or_model.is_a?(Symbol)
+      end
+
+      # Returns a Model or nil
+      def to_model(character)
+        character.to_s.camelize.safe_constantize
+      end
     end
+    extend ClassMethods
+    delegate :begin, :end, :tell, :to_character, :to_character!, :to_model, :to => 'self.class'
+
 
     def initialize(parent = self.class.current)
       super(){|h, k| parent[k] if parent }
       @parent = parent
-      @current = Hash.new{|h, k| parent.current[k] if parent}
-      @fill_attributes = Hash.new{|h, k| parent.fill_attributes[k] if parent }
-      @characters = Hash.new do |h, k|
-        if parent
-          parent.characters[k]
-        elsif k.is_a?(Symbol)
-          k.to_s.camelize.constantize
+      @current = Hash.new do |h, k|
+        if (char = to_character!(k))
+          h[char]
+        else
+          parent.current[k] if parent
         end
       end
+      @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)
       @filling = []
       @after_imagine = {}
@@ -84,7 +109,8 @@ module Scheherazade
     #    end
     #    story.current[User] # => nil
     #
-    def imagine(character, attributes = nil)
+    def imagine(character_or_model, attributes = nil)
+      character = to_character(character_or_model)
       prev, @building = @building, [] # because method might be re-entrant
       CharacterBuilder.new(character).build(attributes) do |ar|
         ar.save!
@@ -105,18 +131,6 @@ module Scheherazade
       current[character] || imagine(character)
     end
 
-    def begin
-      self.class.begin
-    end
-
-    def end(opts = nil)
-      self.class.end(opts)
-    end
-
-    def tell(opts = nil)
-      self.class.tell(opts){|story| yield story }
-    end
-
     # Allows one to temporarily override the current characters while
     # the given block executes
     #
@@ -129,8 +143,9 @@ module Scheherazade
     end
 
     def fill(character_or_model, *with)
-      fill_attributes[character_or_model] = with
-      @characters[character_or_model] = current_fill if character_or_model.is_a? Symbol
+      char = to_character(character_or_model)
+      fill_attributes[char] = with
+      @characters[char] = current_fill unless to_model(char)
       begin
         @filling.push(character_or_model)
         yield

data/lib/scheherazade/version.rb

@@ -1,3 +1,3 @@
 module Scheherazade
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scheherazade
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3529941096747853729
+      hash: 3377084161247893965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3529941096747853729
+      hash: 3377084161247893965
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24