woyo-world 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b8db18d440d61ddaf291c7db149e5fa35f8a98
-  data.tar.gz: 393a37a546f63d71e2132374c927f0571d475c4b
+  metadata.gz: 2c1c941040eef171a088f6ee54a6416f55eb46ba
+  data.tar.gz: 881d8203e4a35f0965a191cf47f6706cc18ee8ba
 SHA512:
-  metadata.gz: 465dab73ed8d398391a9e7ca63bac830b205a7622e895a5b1fc736ad36d7c2f36179a5713f7bece47aaf53ab6ecdb438937f9c8b026f730f5d3b9eff1e8f2f08
-  data.tar.gz: 033f7d8ddf1839495ead16bb0d65ae6e4e7df2469bb31ab7e5e7993483a41c7d8e4d1485d43eccd3844f2fd1ce0f6813fe02497ccd8bc9ca4e36bffe836dc076
+  metadata.gz: eb02560ec28f3cc4c370406424518b5c9246a69c34225903e5a17abde911be52231a9cc1670ffc37036c1da788492b39d78b141a00aa17d1f1776996b748bf84
+  data.tar.gz: 958c5a2eacdf5be0ef4e3e3a0fd0ba420040bc8842efebdf18d03a5e427cfbf5bfa05eac7eac2fb4b12e84bb653157cc11f8aaee8998a4d6c946c714bea429cd

data/lib/woyo/world/actions.rb

@@ -0,0 +1,24 @@
+require_relative 'attributes'
+
+module Woyo
+
+module Actions
+
+  include Attributes
+
+  def action *acts, &block
+    send :_attributes, acts, ivn: '@actions', &block
+  end
+
+  def actions *acts, &block
+    send :_attributes, acts, ivn: '@actions', &block
+  end
+
+  def do act
+    send act
+  end
+
+end
+
+end
+

data/lib/woyo/world/attributes.rb

@@ -8,195 +8,146 @@ module Woyo
 
 module Attributes
 
-  def self.included(base)
-    base.extend(ClassMethods)
+  def attribute *attrs, &block
+    send :_attributes, attrs, ivn: '@attributes', &block
   end
 
-  def self.prepended(base)
-    base.singleton_class.prepend(ClassMethods)  # base.extend(ClassMethods) also seems to work, what's the diff ?
+  def attributes *attrs, &block
+    send :_attributes, attrs, ivn: '@attributes', &block
   end
-  
-  def initialize *args
-    initialize_attributes
-    initialize_groups
-    initialize_boolean_groups
-    initialize_is_overrides
-    #super # we'll need this if we prepend Attributes again 
-  end
-
-  module ClassMethods
 
-    def define_attr_methods attr, default = nil
-      define_attr_default attr, default
-      define_attr_equals attr
-      define_attr attr
-      if default == true || default == false    # boolean convenience methods
-        define_attr? attr
-        define_attr! attr
-      end
+  def _attributes attrs, ivn:, &block
+    if instance_variable_defined? ivn
+      ivar = instance_variable_get ivn
+    else
+      ivar = instance_variable_set ivn, Woyo::Attributes::AttributesHash.new 
     end
-
-    def define_attr_default attr, default
-      define_method "#{attr}_default" do
-        if default.respond_to? :call
-          return default.arity == 0 ? default.call : default.call(self)
+    return ivar if attrs.empty?
+    attrs.each do |attr|
+      case
+      when attr.kind_of?( Hash )
+        attr.each do |attr_sym,default|
+          define_attr_methods attr_sym, default, ivn: ivn
+          ivar[attr_sym] = send "#{attr_sym}_default"
         end
-        default
-      end
-    end
-
-    def define_attr_equals attr
-      define_method "#{attr}=" do |arg|
-        attributes[attr] = arg
-      end
-    end
-
-    def define_attr attr
-      define_method attr do |arg = nil|
-        return attributes[attr] = arg unless arg.nil?
-        return attributes[attr]       unless attributes[attr].kind_of? Hash
-        true_attribute_match = attributes[attr].detect { |name,value| attributes[name] == true }
-        return true_attribute_match[1] if true_attribute_match
-        attributes[attr]
-      end
-    end
-
-    def define_attr? attr
-      define_method "#{attr}?" do
-        ( send attr ) ? true : false
-      end
-    end
-
-    def define_attr! attr
-      define_method "#{attr}!" do
-        send "#{attr}=", true
-      end
-    end
-
-    def attributes *attrs
-      @attributes ||= []
-      return @attributes if attrs.empty?
-      attrs.each do |attr|
-        if attr.kind_of? Hash
-          attr.each do |attr_sym,default_value|
-            @attributes << attr_sym unless @attributes.include? attr_sym
-            define_attr_methods attr_sym, default_value
-          end
-        else
-          unless @attributes.include? attr
-            @attributes << attr
-            define_attr_methods attr
-          end
+      when block
+        define_attr_methods attr, block, ivn: ivn
+        ivar[attr] = send "#{attr}_default"
+      else
+        unless ivar.include? attr
+          define_attr_methods attr, ivn: ivn
+          ivar[attr] = nil
         end
       end
     end
+  end
 
-    def attribute *attrs
-      self.attributes *attrs
-    end
-
-    def groups
-      @groups ||= {}
+  def define_attr_methods( attr, default = nil, ivn: )
+    define_attr_default attr, default
+    define_attr_equals attr, ivn: ivn
+    define_attr attr, ivn: ivn
+    if default == true || default == false    # boolean convenience methods
+      define_attr? attr
+      define_attr! attr
     end
+  end
 
-    def group sym, *attrs
-      @groups ||= {}
-      group = @groups[sym] ? @groups[sym] : ( @groups[sym] = [] )
-      self.attributes *attrs
-      attrs.each do |attr|
-        if attr.kind_of? Hash
-          attr.each do |attr_sym,default_value|
-            group << attr_sym
-          end
-        else
-          group << attr
-        end
-      end
-      define_method sym do
-        groups[sym]  
-      end
-      group
+  def define_attr_default attr, default
+    define_singleton_method "#{attr}_default" do
+      default
     end
+  end
 
-    def boolean_groups
-      @boolean_groups ||={}
-    end
-
-    def group! sym, *attrs
-      @boolean_groups ||= {}
-      group = @boolean_groups[sym] ? @boolean_groups[sym] : ( @boolean_groups[sym] = [] )
-      self.attributes *attrs
-      attrs.each do |attr|
-        define_attr? attr
-        define_attr! attr
-        if attr.kind_of? Hash
-          attr.each do |attr_sym,default_value|
-            group << attr_sym
-          end
-        else
-          group << attr
-        end
-      end
-      define_method sym do
-        boolean_groups[sym]
-      end
-      group
+  def define_attr_equals( attr, ivn: )
+    define_singleton_method "#{attr}=" do |arg|
+      ivar = instance_variable_get ivn
+      ivar[attr] = arg
     end
+  end
 
-    def is *attrs
-      @is_overrides ||= []
-      attrs.each do |attr|
-        @is_overrides << attr unless @is_overrides.include? attr 
-        self.attribute( { attr => true } )
+  def define_attr( attr, ivn: )
+    define_singleton_method attr do |arg = nil|
+      ivar = instance_variable_get ivn
+      return ivar[attr] = arg unless arg.nil?
+      case
+      when ivar[attr].kind_of?( Hash )
+        true_attribute_match = ivar[attr].detect { |name,value| ivar[name] == true }
+        return true_attribute_match[1] if true_attribute_match
+        ivar[attr]
+      when ivar[attr].respond_to?( :call )
+        return ivar[attr].arity == 0 ? ivar[attr].call : ivar[attr].call(self)
+      else
+        ivar[attr]
       end
     end
+  end
 
-    def is_overrides
-      @is_overrides ||= []
-    end
-
-  end  # module ClassMethods
-
-  def initialize_attributes
-    @attributes = self.class.attributes.each_with_object(Woyo::Attributes::AttributesHash.new) do |attr,hash|
-      hash[attr] = send "#{attr}_default"
+  def define_attr? attr
+    define_singleton_method "#{attr}?" do
+      ( send attr ) ? true : false
     end
   end
 
-  def initialize_groups
-    @groups = {}
-    self.class.groups.each { |sym,members| @groups[sym] = Woyo::Attributes::Group.new @attributes, *members }
-    @groups
+  def define_attr! attr
+    define_singleton_method "#{attr}!" do
+      send "#{attr}=", true
+    end
   end
 
-  def initialize_boolean_groups
-    @boolean_groups = {}
-    self.class.boolean_groups.each { |sym,members| @boolean_groups[sym] = Woyo::Attributes::BooleanGroup.new @attributes, *members }
-    @boolean_groups
+  def is? attr
+    send "#{attr}?"
   end
 
-  def initialize_is_overrides
-    self.class.is_overrides.each { |attr| send "#{attr}!" } 
+  def is attr
+    send "#{attr}=", true
   end
 
-  def attributes
-    @attributes
-  end
-  
   def groups
     @groups
   end
 
-  def boolean_groups
-    @boolean_groups
+  def group sym, *attrs
+    @groups ||= {}
+    grp = @groups[sym] ? @groups[sym] : ( @groups[sym] = Woyo::Attributes::Group.new attributes )
+    attributes *attrs
+    attrs.each do |attr|
+      if attr.kind_of? Hash
+        attr.each do |attr_sym,default_value|
+          grp << attr_sym
+        end
+      else
+        grp << attr
+      end
+    end
+    define_singleton_method sym do
+      @groups[sym]  
+    end
+    grp
   end
 
-  def is? attr
-    send "#{attr}?"
+  def exclusions
+    @exclusions
   end
-
-  def is attr
-    send "#{attr}=", true
+ 
+  def exclusion sym, *attrs
+    @exclusions ||= {}
+    exc = @exclusions[sym] ? @exclusions[sym] : ( @exclusions[sym] = Woyo::Attributes::Exclusion.new attributes )
+    attributes *attrs
+    attrs.each do |attr|
+      define_attr? attr
+      define_attr! attr
+      if attr.kind_of? Hash
+        attr.each do |attr_sym,default_value|
+          exc << attr_sym
+        end
+      else
+        exc << attr
+      end
+    end
+    define_singleton_method sym do
+      @exclusions[sym]
+    end
+    exc
   end
 
 end

data/lib/woyo/world/character.rb

@@ -4,7 +4,10 @@ module Woyo
 
 class Character < WorldObject
 
-  attributes :description, name: lambda { |this| this.id.to_s.capitalize }
+  def initialize_object
+    super
+    attributes :description, name: lambda { |this| this.id.to_s.capitalize }
+  end
 
   def world
     @world ||= context if context.is_a? World

data/lib/woyo/world/{dsl.rb → evaluate.rb}

@@ -1,7 +1,7 @@
 
 module Woyo
 
-module DSL
+module Evaluate
   
   def evaluate &block
     (block.arity < 1 ? (instance_eval &block) : block.call(self)) if block_given?
@@ -35,7 +35,6 @@ module DSL
             when !#{child} && !known &&  block_given? then #{child} = self.#{child}s[id] = #{child.capitalize}.new id, context: self, &block
             when !#{child} && !known && !block_given? then #{child} = self.#{child}s[id] = #{child.capitalize}.new id, context: self
             end
-            # maybe: god-like lists of everything at world level... would need unique ids... self.world.#{child}s[id] = #{child} if !known && self.world
             #{child}
           end
 

data/lib/woyo/world/group.rb

@@ -33,7 +33,7 @@ module Attributes
 
     extend Forwardable
 
-    def_delegators :@members, :count
+    def_delegators :@members, :count, :<<
     def_delegators :@attributes, :[], :[]=
 
     attr_reader :members, :attributes
@@ -53,19 +53,34 @@ module Attributes
 
   end
 
-  class BooleanGroup < Group
+  class Exclusion < Group
 
     attr_reader :default 
     
     def initialize attributes, *members
       super
-      @default = @members.first
-      self[@default] = true
-      @members.each { |member| @attributes.add_attribute_listener member, self }
+      if @members && ! @members.empty?
+        @default = @members.first
+        self[@default] = true
+        @members.each { |member| @attributes.add_attribute_listener member, self }
+      end
+    end
+
+    def << new_member
+      raise "#{new_member} is not an attribute" unless @attributes.names.include? new_member
+      super
+      if @members.count == 1
+        @default = new_member
+        @attributes.set new_member, true
+      else
+        @attributes.set new_member, false
+      end
+      @attributes.add_attribute_listener new_member, self
+      self
     end
 
     def []= this_member, value
-      raise '#{this_member} is not a member of this group' unless @members.include? this_member
+      raise "#{this_member} is not a member of this group" unless @members.include? this_member
       super
       if value #true
         # sync group members via AttributesHash#set to prevent triggering notify

data/lib/woyo/world/item.rb

@@ -0,0 +1,26 @@
+require_relative 'world_object'
+
+module Woyo
+
+class Item < WorldObject
+
+  def initialize_object
+    super
+  end
+
+  def location
+    self.context.instance_of?( Location ) ? self.context : nil
+  end
+
+  def world
+    case
+    when self.context.instance_of?( World )   then self.context
+    when self.context.instance_of?( Location) then self.context.world
+    else nil
+    end
+  end
+
+end
+
+end
+

data/lib/woyo/world/location.rb

@@ -4,12 +4,14 @@ module Woyo
 
 class Location < WorldObject
 
-  attributes :description, name: lambda { |this| this.id.to_s.capitalize }
+  children   :way, :item
 
-  children   :way, :character
+  def initialize_object
+    super
+  end
 
   def world
-    self.context
+    context
   end
 
   def here