woyo-world 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41529c0e59bef04bb41b1732e50ef7f75ec94b0f
-  data.tar.gz: 6df39185e8e284a7beb7985adecbbae2741e8edc
+  metadata.gz: d6b8db18d440d61ddaf291c7db149e5fa35f8a98
+  data.tar.gz: 393a37a546f63d71e2132374c927f0571d475c4b
 SHA512:
-  metadata.gz: 18d325950bf55638c7f88ca8c24008affbea3f1fc123f2e24d2dca9fd193b20ef5d247113fbf3abe8b3598b887e063373f2ac92e50bf24213397d3498d55757a
-  data.tar.gz: 044aecb2e1e1c830c6ed1fb450be14fe7ebc76b338312a63c0616dcf8a651ec85d205b57a5c5da626287d2da7d022aac342e095c9a70decf32c25534262b61e0
+  metadata.gz: 465dab73ed8d398391a9e7ca63bac830b205a7622e895a5b1fc736ad36d7c2f36179a5713f7bece47aaf53ab6ecdb438937f9c8b026f730f5d3b9eff1e8f2f08
+  data.tar.gz: 033f7d8ddf1839495ead16bb0d65ae6e4e7df2469bb31ab7e5e7993483a41c7d8e4d1485d43eccd3844f2fd1ce0f6813fe02497ccd8bc9ca4e36bffe836dc076

data/lib/woyo/world/attributes.rb

@@ -1,31 +1,75 @@
+require_relative 'group'
+
+class Hash
+  alias_method :names, :keys
+end
 
 module Woyo
 
 module Attributes
 
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  def self.prepended(base)
+    base.singleton_class.prepend(ClassMethods)  # base.extend(ClassMethods) also seems to work, what's the diff ?
+  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 create_attribute_methods_with_define_method attr, default = nil
+    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
+    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)
+        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|
-        if arg.nil?
-          unless attributes.has_key? attr
-            if default.respond_to? :call
-              if default.arity == 0
-                attributes[attr] = default.call # todo: is this the same as ? ... instance_eval &default
-              else
-                attributes[attr] = default.call(self)
-              end
-            else
-              attributes[attr] = default
-            end
-          end
-          attributes[attr]
-        else
-          attributes[attr] = arg
-        end
+        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
 
@@ -35,24 +79,124 @@ module Attributes
       attrs.each do |attr|
         if attr.kind_of? Hash
           attr.each do |attr_sym,default_value|
-            @attributes << attr_sym
-            create_attribute_methods_with_define_method attr_sym, default_value
+            @attributes << attr_sym unless @attributes.include? attr_sym
+            define_attr_methods attr_sym, default_value
           end
         else
-          @attributes << attr
-          create_attribute_methods_with_define_method attr
+          unless @attributes.include? attr
+            @attributes << attr
+            define_attr_methods attr
+          end
         end
       end
     end
 
-  end 
+    def attribute *attrs
+      self.attributes *attrs
+    end
+
+    def groups
+      @groups ||= {}
+    end
 
-  def self.included(base)
-    base.extend(ClassMethods)
+    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
+    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
+    end
+
+    def is *attrs
+      @is_overrides ||= []
+      attrs.each do |attr|
+        @is_overrides << attr unless @is_overrides.include? attr 
+        self.attribute( { attr => true } )
+      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"
+    end
   end
-  
+
+  def initialize_groups
+    @groups = {}
+    self.class.groups.each { |sym,members| @groups[sym] = Woyo::Attributes::Group.new @attributes, *members }
+    @groups
+  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
+  end
+
+  def initialize_is_overrides
+    self.class.is_overrides.each { |attr| send "#{attr}!" } 
+  end
+
   def attributes
-    @attributes ||= {}
+    @attributes
+  end
+  
+  def groups
+    @groups
+  end
+
+  def boolean_groups
+    @boolean_groups
+  end
+
+  def is? attr
+    send "#{attr}?"
+  end
+
+  def is attr
+    send "#{attr}=", true
   end
 
 end

data/lib/woyo/world/group.rb

@@ -0,0 +1,101 @@
+require 'forwardable'
+
+module Woyo
+
+module Attributes
+
+  class AttributesHash < Hash
+
+    alias_method :names, :keys
+    alias_method :set, :[]=
+
+    attr_reader :listeners
+
+    def initialize
+      @listeners = {}
+    end
+
+    def add_attribute_listener attr, listener
+      @listeners[attr] = listener
+    end
+    
+    def []= attr, value
+      old_value = self[attr]
+      super
+      if ( listener = @listeners[attr] ) && value != old_value
+        listener.notify attr, value
+      end
+    end
+
+  end
+
+  class Group
+
+    extend Forwardable
+
+    def_delegators :@members, :count
+    def_delegators :@attributes, :[], :[]=
+
+    attr_reader :members, :attributes
+
+    def initialize attributes, *members
+      @attributes = attributes
+      @members = members
+    end
+
+    def names
+      @members
+    end
+
+    def values
+      @attributes.values_at *@members
+    end
+
+  end
+
+  class BooleanGroup < Group
+
+    attr_reader :default 
+    
+    def initialize attributes, *members
+      super
+      @default = @members.first
+      self[@default] = true
+      @members.each { |member| @attributes.add_attribute_listener member, self }
+    end
+
+    def []= this_member, value
+      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
+        @members.each { |member| @attributes.set(member,false) unless member == this_member }
+      else     #false
+        if self.count == 2  # binary group
+          @members.each { |member| @attributes.set member ,(member != this_member ) }
+        else
+          self[@default] = true # revert to default
+        end
+      end
+    end
+
+    def notify this_member, value
+      # assuming value==true for now
+      # sync group members via AttributesHash#set to prevent re-triggering notify
+      @members.each { |member| @attributes.set(member,false) unless member == this_member }
+    end
+
+    def value
+      @members.detect { |member| @attributes[member] } # name of first member with true value 
+    end
+
+    def default!
+      self[@default] = true
+    end
+
+  end
+
+end
+
+end
+

data/lib/woyo/world/version.rb

@@ -1,3 +1,3 @@
 module Woyo
-  WORLD_VERSION = "0.0.5"
+  WORLD_VERSION = "0.0.6"
 end

data/lib/woyo/world/way.rb

@@ -6,12 +6,26 @@ class Way < WorldObject
 
   attributes :description, name: lambda { |this| this.id.to_s.capitalize }
 
+  group! :passable, :closed, :open  # defaults to closed: true 
+
+  def world
+    from ? from.world : nil
+  end
+
+  def close!
+    closed!
+  end
+
   def from
     @from ||= context
   end
 
-  def world
-    from ? from.world : nil
+  def to arg=nil
+    if arg.nil?
+      @to
+    else
+      self.to = arg
+    end
   end
 
   def to= arg
@@ -26,15 +40,16 @@ class Way < WorldObject
       else
         @to = Location.new arg            # create free-standing destination location
       end
+      self.open!
+    else
+      raise "Symbol required, but #{arg.class} : '#{arg}' given."
     end
   end
 
-  def to arg=nil
-    if arg.nil?
-      @to
-    else
-      self.to = arg
-    end
+  attribute :going 
+  
+  def go
+    { go: open?, going: self.going }
   end
 
 end

data/lib/woyo/world/world_object.rb

@@ -6,6 +6,7 @@ module Woyo
 
 class WorldObject
 
+  #prepend Attributes
   include Attributes
   include DSL
 
@@ -15,6 +16,7 @@ class WorldObject
   def initialize id, context: nil, &block
     @id = id.to_s.downcase.to_sym
     @context = context
+    super  # initializes attributes
     evaluate &block
   end